Skip to content

Commit

Permalink
Extra examples, a small PR with minor changes (#81)
Browse files Browse the repository at this point in the history
* botania examples and fixes

* draconic evolution examples and fixes

* mekanism examples and went overboard

* immersive engineering examples and also overboard

* enderio examples and fixes

* make condition/transformer return a new object

* vanilla

* split examples into preInit and postInit, update runConfig

* replace %s with {}

* return early if required mod isnt loaded

* fix scripts more

* fix ic2 debug

* rename loot examples file

* preinit vanilla examples and assets

* deprecate EnergyRecipeBuilder and TimeRecipeBuilder

* industrialcraft build.gradle fix

* tweaked conditional loading of examples

* fix thermal build.gradle

* remove duplicate binding casings

* tweaked conditional loading of examples (missed one)

* a horrid lack of a whitespace

* remove leftover dev comments

* astral sorcery examples and fixes

* blood magic examples and fix

* extended crafting examples

* make scriptPath be set to the examples folder in dev

* starting items off by one logging mistake

* address review
  • Loading branch information
WaitingIdly authored Aug 4, 2023
1 parent a8819ae commit d4565da
Show file tree
Hide file tree
Showing 173 changed files with 5,688 additions and 1,644 deletions.
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

0 comments on commit d4565da

Please sign in to comment.