Skip to content

Commit 001996a

Browse files
brachy84brachy84
committed
fix #372 (update immersive technology)
1 parent eecb65d commit 001996a

13 files changed

Lines changed: 46 additions & 56 deletions

File tree

‎examples/postInit/generated/immersivetech_generated.groovy‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ mods.immersivetech.boiler.removeByOutput(fluid('steam'))
1414

1515
mods.immersivetech.boiler.recipeBuilder()
1616
.fluidInput(fluid('lava') * 100)
17-
.fluidOutput(fluid('hot_spring_water') * 500)
17+
.fluidOutput(fluid('hotwater') * 500)
1818
.time(100)
1919
.register()
2020

@@ -48,18 +48,18 @@ mods.immersivetech.boiler_fuel.recipeBuilder()
4848
// Converts up to two input fluidstacks into up to three output fluidstacks after a given amount of time in a multiblock
4949
// structure.
5050

51-
mods.immersivetech.cooling_tower.removeByInput(fluid('hot_spring_water'))
51+
mods.immersivetech.cooling_tower.removeByInput(fluid('hotwater'))
5252
// mods.immersivetech.cooling_tower.removeByOutput(fluid('water'))
5353
// mods.immersivetech.cooling_tower.removeAll()
5454

5555
mods.immersivetech.cooling_tower.recipeBuilder()
5656
.fluidInput(fluid('lava') * 100)
57-
.fluidOutput(fluid('hot_spring_water') * 500)
57+
.fluidOutput(fluid('hotwater') * 500)
5858
.time(100)
5959
.register()
6060

6161
mods.immersivetech.cooling_tower.recipeBuilder()
62-
.fluidInput(fluid('water') * 50, fluid('hot_spring_water') * 50)
62+
.fluidInput(fluid('water') * 50, fluid('hotwater') * 50)
6363
.fluidOutput(fluid('lava') * 50, fluid('water') * 50, fluid('lava') * 50)
6464
.time(50)
6565
.register()
@@ -76,7 +76,7 @@ mods.immersivetech.distiller.removeByOutput(fluid('distwater'))
7676

7777
mods.immersivetech.distiller.recipeBuilder()
7878
.fluidInput(fluid('lava') * 100)
79-
.fluidOutput(fluid('hot_spring_water') * 500)
79+
.fluidOutput(fluid('hotwater') * 500)
8080
.time(100)
8181
.register()
8282

@@ -100,14 +100,14 @@ mods.immersivetech.electrolytic_crucible_battery.removeByInput(fluid('moltensalt
100100

101101
mods.immersivetech.electrolytic_crucible_battery.recipeBuilder()
102102
.fluidInput(fluid('lava') * 100)
103-
.fluidOutput(fluid('hot_spring_water') * 500)
103+
.fluidOutput(fluid('hotwater') * 500)
104104
.output(item('minecraft:clay'))
105105
.time(100)
106106
.register()
107107

108108
mods.immersivetech.electrolytic_crucible_battery.recipeBuilder()
109109
.fluidInput(fluid('water') * 500)
110-
.fluidOutput(fluid('lava') * 50, fluid('hot_spring_water') * 50, fluid('water') * 400)
110+
.fluidOutput(fluid('lava') * 50, fluid('hotwater') * 50, fluid('water') * 400)
111111
.output(item('minecraft:diamond'))
112112
.time(50)
113113
.energy(5000)
@@ -124,7 +124,7 @@ mods.immersivetech.gas_turbine.removeByInput(fluid('biodiesel'))
124124

125125
mods.immersivetech.gas_turbine.recipeBuilder()
126126
.fluidInput(fluid('lava') * 100)
127-
.fluidOutput(fluid('hot_spring_water') * 500)
127+
.fluidOutput(fluid('hotwater') * 500)
128128
.time(100)
129129
.register()
130130

@@ -140,17 +140,17 @@ mods.immersivetech.gas_turbine.recipeBuilder()
140140
// structure.
141141

142142
mods.immersivetech.heat_exchanger.removeByInput(fluid('fluegas'))
143-
mods.immersivetech.heat_exchanger.removeByOutput(fluid('hot_spring_water'))
143+
mods.immersivetech.heat_exchanger.removeByOutput(fluid('hotwater'))
144144
// mods.immersivetech.heat_exchanger.removeAll()
145145

146146
mods.immersivetech.heat_exchanger.recipeBuilder()
147147
.fluidInput(fluid('lava') * 100, fluid('lava') * 50)
148-
.fluidOutput(fluid('hot_spring_water') * 500)
148+
.fluidOutput(fluid('hotwater') * 500)
149149
.time(100)
150150
.register()
151151

152152
mods.immersivetech.heat_exchanger.recipeBuilder()
153-
.fluidInput(fluid('water') * 50, fluid('hot_spring_water') * 50)
153+
.fluidInput(fluid('water') * 50, fluid('hotwater') * 50)
154154
.fluidOutput(fluid('lava') * 50, fluid('water') * 10)
155155
.time(50)
156156
.energy(5000)
@@ -167,7 +167,7 @@ mods.immersivetech.high_pressure_steam_turbine.removeByInput(fluid('highpressure
167167

168168
mods.immersivetech.high_pressure_steam_turbine.recipeBuilder()
169169
.fluidInput(fluid('lava') * 100)
170-
.fluidOutput(fluid('hot_spring_water') * 500)
170+
.fluidOutput(fluid('hotwater') * 500)
171171
.time(100)
172172
.register()
173173

@@ -187,15 +187,14 @@ mods.immersivetech.melting_crucible.removeByOutput(fluid('moltensalt'))
187187

188188
mods.immersivetech.melting_crucible.recipeBuilder()
189189
.input(item('minecraft:diamond'))
190-
.fluidOutput(fluid('hot_spring_water'))
190+
.fluidOutput(fluid('hotwater'))
191191
.time(100)
192192
.register()
193193

194194
mods.immersivetech.melting_crucible.recipeBuilder()
195195
.input(item('minecraft:clay') * 8)
196196
.fluidOutput(fluid('lava') * 50)
197197
.time(50)
198-
.energy(5000)
199198
.register()
200199

201200

@@ -208,7 +207,7 @@ mods.immersivetech.radiator.removeByInput(fluid('exhauststeam'))
208207

209208
mods.immersivetech.radiator.recipeBuilder()
210209
.fluidInput(fluid('lava') * 100)
211-
.fluidOutput(fluid('hot_spring_water') * 500)
210+
.fluidOutput(fluid('hotwater') * 500)
212211
.time(100)
213212
.register()
214213

@@ -229,7 +228,7 @@ mods.immersivetech.solar_tower.removeByOutput(fluid('superheatedmoltensodium'))
229228

230229
mods.immersivetech.solar_tower.recipeBuilder()
231230
.fluidInput(fluid('lava') * 100)
232-
.fluidOutput(fluid('hot_spring_water') * 500)
231+
.fluidOutput(fluid('hotwater') * 500)
233232
.time(100)
234233
.register()
235234

@@ -250,7 +249,7 @@ mods.immersivetech.steam_turbine.removeByInput(fluid('steam'))
250249

251250
mods.immersivetech.steam_turbine.recipeBuilder()
252251
.fluidInput(fluid('lava') * 100)
253-
.fluidOutput(fluid('hot_spring_water') * 500)
252+
.fluidOutput(fluid('hotwater') * 500)
254253
.time(100)
255254
.register()
256255

‎src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/Boiler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ public class Boiler extends StandardListRegistry<BoilerRecipe> {
1818

1919
@Override
2020
public boolean isEnabled() {
21-
return Config.ITConfig.Machines.Multiblock.enable_boiler;
21+
return Config.ITConfig.Multiblocks.enable.enable_boiler;
2222
}
2323

2424
@RecipeBuilderDescription(example = {
25-
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hot_spring_water') * 500).time(100)"),
25+
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hotwater') * 500).time(100)"),
2626
@Example(".fluidInput(fluid('water') * 50).fluidOutput(fluid('lava') * 50).time(50)")
2727
})
2828
public RecipeBuilder recipeBuilder() {

‎src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/BoilerFuel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class BoilerFuel extends StandardListRegistry<BoilerRecipe.BoilerFuelReci
1818

1919
@Override
2020
public boolean isEnabled() {
21-
return Config.ITConfig.Machines.Multiblock.enable_boiler;
21+
return Config.ITConfig.Multiblocks.enable.enable_boiler;
2222
}
2323

2424
@RecipeBuilderDescription(example = {

‎src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/CoolingTower.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ public class CoolingTower extends StandardListRegistry<CoolingTowerRecipe> {
1818

1919
@Override
2020
public boolean isEnabled() {
21-
return Config.ITConfig.Machines.Multiblock.enable_coolingTower;
21+
return Config.ITConfig.Multiblocks.enable.enable_coolingTower;
2222
}
2323

2424
@RecipeBuilderDescription(example = {
25-
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hot_spring_water') * 500).time(100)"),
26-
@Example(".fluidInput(fluid('water') * 50, fluid('hot_spring_water') * 50).fluidOutput(fluid('lava') * 50, fluid('water') * 50, fluid('lava') * 50).time(50)")
25+
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hotwater') * 500).time(100)"),
26+
@Example(".fluidInput(fluid('water') * 50, fluid('hotwater') * 50).fluidOutput(fluid('lava') * 50, fluid('water') * 50, fluid('lava') * 50).time(50)")
2727
})
2828
public RecipeBuilder recipeBuilder() {
2929
return new RecipeBuilder();
@@ -34,7 +34,7 @@ public Collection<CoolingTowerRecipe> getRecipes() {
3434
return CoolingTowerRecipe.recipeList;
3535
}
3636

37-
@MethodDescription(example = @Example("fluid('hot_spring_water')"))
37+
@MethodDescription(example = @Example("fluid('hotwater')"))
3838
public void removeByInput(IIngredient input) {
3939
getRecipes().removeIf(r -> {
4040
for (FluidStack fluidStack : r.getFluidInputs()) {

‎src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/Distiller.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ public class Distiller extends StandardListRegistry<DistillerRecipe> {
1919

2020
@Override
2121
public boolean isEnabled() {
22-
return Config.ITConfig.Machines.Multiblock.enable_distiller;
22+
return Config.ITConfig.Multiblocks.enable.enable_distiller;
2323
}
2424

2525
@RecipeBuilderDescription(example = {
26-
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hot_spring_water') * 500).time(100)"),
26+
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hotwater') * 500).time(100)"),
2727
@Example(".fluidInput(fluid('water') * 50).fluidOutput(fluid('lava') * 50).output(item('minecraft:diamond')).chance(0.5f).time(50).energy(5000)")
2828
})
2929
public RecipeBuilder recipeBuilder() {

‎src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/ElectrolyticCrucibleBattery.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ public class ElectrolyticCrucibleBattery extends StandardListRegistry<Electrolyt
1818

1919
@Override
2020
public boolean isEnabled() {
21-
return Config.ITConfig.Machines.Multiblock.enable_electrolyticCrucibleBattery;
21+
return Config.ITConfig.Multiblocks.enable.enable_electrolyticCrucibleBattery;
2222
}
2323

2424
@RecipeBuilderDescription(example = {
25-
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hot_spring_water') * 500).output(item('minecraft:clay')).time(100)"),
26-
@Example(".fluidInput(fluid('water') * 500).fluidOutput(fluid('lava') * 50, fluid('hot_spring_water') * 50, fluid('water') * 400).output(item('minecraft:diamond')).time(50).energy(5000)")
25+
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hotwater') * 500).output(item('minecraft:clay')).time(100)"),
26+
@Example(".fluidInput(fluid('water') * 500).fluidOutput(fluid('lava') * 50, fluid('hotwater') * 50, fluid('water') * 400).output(item('minecraft:diamond')).time(50).energy(5000)")
2727
})
2828
public RecipeBuilder recipeBuilder() {
2929
return new RecipeBuilder();

‎src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/GasTurbine.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ public class GasTurbine extends StandardListRegistry<GasTurbineRecipe> {
1818

1919
@Override
2020
public boolean isEnabled() {
21-
return Config.ITConfig.Machines.Multiblock.enable_gasTurbine;
21+
return Config.ITConfig.Multiblocks.enable.enable_gasTurbine;
2222
}
2323

2424
@RecipeBuilderDescription(example = {
25-
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hot_spring_water') * 500).time(100)"),
25+
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hotwater') * 500).time(100)"),
2626
@Example(".fluidInput(fluid('water') * 50).fluidOutput(fluid('lava') * 50).time(50)")
2727
})
2828
public RecipeBuilder recipeBuilder() {

‎src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/HeatExchanger.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ public class HeatExchanger extends StandardListRegistry<HeatExchangerRecipe> {
1818

1919
@Override
2020
public boolean isEnabled() {
21-
return Config.ITConfig.Machines.Multiblock.enable_heatExchanger;
21+
return Config.ITConfig.Multiblocks.enable.enable_heatExchanger;
2222
}
2323

2424
@RecipeBuilderDescription(example = {
25-
@Example(".fluidInput(fluid('lava') * 100, fluid('lava') * 50).fluidOutput(fluid('hot_spring_water') * 500).time(100)"),
26-
@Example(".fluidInput(fluid('water') * 50, fluid('hot_spring_water') * 50).fluidOutput(fluid('lava') * 50, fluid('water') * 10).time(50).energy(5000)")
25+
@Example(".fluidInput(fluid('lava') * 100, fluid('lava') * 50).fluidOutput(fluid('hotwater') * 500).time(100)"),
26+
@Example(".fluidInput(fluid('water') * 50, fluid('hotwater') * 50).fluidOutput(fluid('lava') * 50, fluid('water') * 10).time(50).energy(5000)")
2727
})
2828
public RecipeBuilder recipeBuilder() {
2929
return new RecipeBuilder();
@@ -47,7 +47,7 @@ public void removeByInput(IIngredient input) {
4747
});
4848
}
4949

50-
@MethodDescription(example = @Example("fluid('hot_spring_water')"))
50+
@MethodDescription(example = @Example("fluid('hotwater')"))
5151
public void removeByOutput(IIngredient output) {
5252
getRecipes().removeIf(r -> {
5353
// would iterate through r.getFluidOutputs() as with the other IE compats, but they forgot to define it so its null.

‎src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/HighPressureSteamTurbine.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ public class HighPressureSteamTurbine extends StandardListRegistry<HighPressureS
1818

1919
@Override
2020
public boolean isEnabled() {
21-
return Config.ITConfig.Machines.Multiblock.enable_highPressureSteamTurbine;
21+
return Config.ITConfig.Multiblocks.enable.enable_highPressureSteamTurbine;
2222
}
2323

2424
@RecipeBuilderDescription(example = {
25-
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hot_spring_water') * 500).time(100)"),
25+
@Example(".fluidInput(fluid('lava') * 100).fluidOutput(fluid('hotwater') * 500).time(100)"),
2626
@Example(".fluidInput(fluid('water') * 50).fluidOutput(fluid('lava') * 50).time(50)")
2727
})
2828
public RecipeBuilder recipeBuilder() {

‎src/main/java/com/cleanroommc/groovyscript/compat/mods/immersivetechnology/MeltingCrucible.java‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ public class MeltingCrucible extends StandardListRegistry<MeltingCrucibleRecipe>
1919

2020
@Override
2121
public boolean isEnabled() {
22-
return Config.ITConfig.Machines.Multiblock.enable_meltingCrucible;
22+
return Config.ITConfig.Multiblocks.enable.enable_meltingCrucible;
2323
}
2424

2525
@RecipeBuilderDescription(example = {
26-
@Example(".input(item('minecraft:diamond')).fluidOutput(fluid('hot_spring_water')).time(100)"),
27-
@Example(".input(item('minecraft:clay') * 8).fluidOutput(fluid('lava') * 50).time(50).energy(5000)")
26+
@Example(".input(item('minecraft:diamond')).fluidOutput(fluid('hotwater')).time(100)"),
27+
@Example(".input(item('minecraft:clay') * 8).fluidOutput(fluid('lava') * 50).time(50)")
2828
})
2929
public RecipeBuilder recipeBuilder() {
3030
return new RecipeBuilder();
@@ -66,21 +66,13 @@ public static class RecipeBuilder extends AbstractRecipeBuilder<MeltingCrucibleR
6666

6767
@Property(comp = @Comp(gte = 0))
6868
private int time;
69-
@Property(comp = @Comp(gte = 0))
70-
private int energy;
7169

7270
@RecipeBuilderMethodDescription
7371
public RecipeBuilder time(int time) {
7472
this.time = time;
7573
return this;
7674
}
7775

78-
@RecipeBuilderMethodDescription
79-
public RecipeBuilder energy(int energy) {
80-
this.energy = energy;
81-
return this;
82-
}
83-
8476
@Override
8577
public String getErrorMsg() {
8678
return "Error adding Immersive Technology Melting Crucible recipe";
@@ -91,14 +83,13 @@ public void validate(GroovyLog.Msg msg) {
9183
validateItems(msg, 1, 1, 0, 0);
9284
validateFluids(msg, 0, 0, 1, 1);
9385
msg.add(time <= 0, "time must be greater than or equal to 1, yet it was {}", time);
94-
msg.add(energy < 0, "energy must be a non negative integer, yet it was {}", energy);
9586
}
9687

9788
@Override
9889
@RecipeBuilderRegistrationMethod
9990
public @Nullable MeltingCrucibleRecipe register() {
10091
if (!validate()) return null;
101-
MeltingCrucibleRecipe recipe = new MeltingCrucibleRecipe(fluidOutput.get(0), ImmersiveEngineering.toIngredientStack(input.get(0)), energy, time);
92+
MeltingCrucibleRecipe recipe = new MeltingCrucibleRecipe(fluidOutput.get(0), ImmersiveEngineering.toIngredientStack(input.get(0)), time);
10293
ModSupport.IMMERSIVE_TECHNOLOGY.get().meltingCrucible.add(recipe);
10394
return recipe;
10495
}

0 commit comments

Comments
 (0)