Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extra examples, a small PR with minor changes #81

Merged
merged 28 commits into from
Aug 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7740c37
botania examples and fixes
WaitingIdly Jul 4, 2023
6e67b02
draconic evolution examples and fixes
WaitingIdly Jul 4, 2023
d73a360
mekanism examples and went overboard
WaitingIdly Jul 6, 2023
1941705
immersive engineering examples and also overboard
WaitingIdly Jul 7, 2023
bf0ffff
enderio examples and fixes
WaitingIdly Jul 18, 2023
a45bb59
make condition/transformer return a new object
WaitingIdly Jul 20, 2023
47aec20
vanilla
WaitingIdly Jul 20, 2023
add96c6
split examples into preInit and postInit, update runConfig
WaitingIdly Jul 20, 2023
8abb13f
replace %s with {}
WaitingIdly Jul 22, 2023
248761e
return early if required mod isnt loaded
WaitingIdly Jul 22, 2023
a2d0f85
fix scripts more
WaitingIdly Jul 22, 2023
a59d11c
fix ic2 debug
WaitingIdly Jul 22, 2023
ff59e0e
rename loot examples file
WaitingIdly Jul 22, 2023
f3a4d88
preinit vanilla examples and assets
WaitingIdly Jul 24, 2023
ac277d8
deprecate EnergyRecipeBuilder and TimeRecipeBuilder
WaitingIdly Jul 24, 2023
fd54dd5
industrialcraft build.gradle fix
WaitingIdly Jul 24, 2023
e7fdcfa
tweaked conditional loading of examples
WaitingIdly Jul 24, 2023
f1d7d90
fix thermal build.gradle
WaitingIdly Jul 24, 2023
cdc1620
remove duplicate binding casings
WaitingIdly Jul 24, 2023
8f15da1
tweaked conditional loading of examples (missed one)
WaitingIdly Jul 25, 2023
4fe2df3
a horrid lack of a whitespace
WaitingIdly Jul 25, 2023
9d79b22
remove leftover dev comments
WaitingIdly Jul 25, 2023
7cf8ffc
astral sorcery examples and fixes
WaitingIdly Aug 2, 2023
1404116
blood magic examples and fix
WaitingIdly Aug 2, 2023
54f19f9
extended crafting examples
WaitingIdly Aug 2, 2023
acab3bb
make scriptPath be set to the examples folder in dev
WaitingIdly Aug 3, 2023
bb42ce1
starting items off by one logging mistake
WaitingIdly Aug 3, 2023
53c07f2
address review
WaitingIdly Aug 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ minecraft {
args << '-Dmixin.hotSwap=true'
args << '-Dmixin.checks.interfaces=true'
args << '-Dmixin.debug.export=true'
if (project.debug_use_examples_folder.toBoolean()) args << '-Dgroovyscript.use_examples_folder=true'
extraRunJvmArguments.addAll(args)

useDependencyAccessTransformers = true
Expand Down Expand Up @@ -118,8 +119,10 @@ dependencies {
runtimeOnly rfg.deobf('curse.maven:mekanism-268560:2835175')
}

compileOnly rfg.deobf('curse.maven:codechicken_lib_1_8-242818:2779848')
compileOnly rfg.deobf('curse.maven:redstone_flux-270789:2920436')
if (project.debug_thermal.toBoolean() || project.debug_de.toBoolean()) {
if (project.debug_thermal.toBoolean() || project.debug_draconic_evolution.toBoolean()) {
runtimeOnly rfg.deobf('curse.maven:codechicken_lib_1_8-242818:2779848')
runtimeOnly rfg.deobf('curse.maven:redstone_flux-270789:2920436')
}

Expand Down Expand Up @@ -163,19 +166,19 @@ dependencies {
runtimeOnly rfg.deobf('curse.maven:thermal_foundation-222880:2926428')
}

compileOnly rfg.deobf('curse.maven:codechicken_lib_1_8-242818:2779848')
compileOnly rfg.deobf('curse.maven:draconic_evolution-223565:3431261')
compileOnly rfg.deobf('curse.maven:brandons_core-231382:3408276')
if (project.debug_de.toBoolean()) {
runtimeOnly rfg.deobf('curse.maven:codechicken_lib_1_8-242818:2779848')
if (project.debug_draconic_evolution.toBoolean()) {
runtimeOnly rfg.deobf('curse.maven:draconic_evolution-223565:3431261')
runtimeOnly rfg.deobf('curse.maven:brandons_core-231382:3408276')
}

// WARNING: experimental must be placed before classic, otherwise you will crash when debugging either.
compileOnly rfg.deobf('curse.maven:industrialcraft_experimental-242638:3838713')
compileOnly rfg.deobf('curse.maven:industrialcraft_classic-242942:3093607')
if (project.debug_ic2.toBoolean()) {
if (project.debug_industrial_craft_2_experimental.toBoolean()) {
runtimeOnly rfg.deobf('curse.maven:industrialcraft_experimental-242638:3838713')
} else if (project.debug_industrial_craft_2_classic.toBoolean()) {
runtimeOnly rfg.deobf('curse.maven:industrialcraft_classic-242942:3093607')
}

Expand All @@ -201,7 +204,7 @@ dependencies {
}

compileOnly rfg.deobf('curse.maven:immersive_engineering-231951:2974106')
if (project.debug_ie.toBoolean()) {
if (project.debug_immersive_engineering.toBoolean()) {
runtimeOnly rfg.deobf('curse.maven:immersive_engineering-231951:2974106')
}

Expand Down Expand Up @@ -229,7 +232,7 @@ dependencies {
}

compileOnly rfg.deobf('curse.maven:immersive_engineering-231951:2974106')
if (project.debug_ie.toBoolean()) {
if (project.debug_immersive_engineering.toBoolean()) {
runtimeOnly rfg.deobf('curse.maven:immersive_engineering-231951:2974106')
}

Expand Down
7 changes: 7 additions & 0 deletions examples/assets/placeholdername/blockstates/dragon_egg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"normal": {
"model": "placeholdername:dragon_egg"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"normal": {
"model": "placeholdername:dragon_egg_lamp"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"normal": {
"model": "placeholdername:generic_block"
}
}
}
7 changes: 7 additions & 0 deletions examples/assets/placeholdername/lang/en_us.lang
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
itemGroup.groovyscript.example_creative_tab=GroovyScript Creative Tab
item.placeholdername.heartofauniverse.name=Heart of the Universe
item.placeholdername.clay_2.name=If clay is so good...
item.placeholdername.clay_3.name=Enchanted Clay
item.placeholdername.snack.name=Snack
tile.placeholdername.generic_block.name=Generic Block
tile.placeholdername.dragon_egg_lamp.name=Dragon Egg Lamp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/dragon_egg",
"textures": {
"all": "placeholdername:blocks/dragon_egg_lamp"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "placeholdername:blocks/generic_block"
}
}
6 changes: 6 additions & 0 deletions examples/assets/placeholdername/models/item/clay_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "placeholdername:items/clay_2"
}
}
6 changes: 6 additions & 0 deletions examples/assets/placeholdername/models/item/clay_3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "placeholdername:items/clay_3"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "placeholdername:block/dragon_egg_lamp"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "placeholdername:block/generic_block"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "placeholdername:items/heartofauniverse"
}
}
6 changes: 6 additions & 0 deletions examples/assets/placeholdername/models/item/snack.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "placeholdername:items/snack"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"animation": {
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
198 changes: 0 additions & 198 deletions examples/astral.groovy

This file was deleted.

Loading