diff options
| author | Elisis <gtandemmodding@gmail.com> | 2024-08-24 05:18:09 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-23 19:18:09 +0000 |
| commit | 71e7f3dc16a7be69a3f89c17a170d401383bf021 (patch) | |
| tree | 2b4f74c3edfdefc2152fb0dd245916e6eb3222f5 /src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe | |
| parent | 0dc1b9feefc03c16efe66e14c5b8707214693658 (diff) | |
| download | GT5-Unofficial-71e7f3dc16a7be69a3f89c17a170d401383bf021.tar.gz GT5-Unofficial-71e7f3dc16a7be69a3f89c17a170d401383bf021.tar.bz2 GT5-Unofficial-71e7f3dc16a7be69a3f89c17a170d401383bf021.zip | |
General beamline fixes, balancing (#2899)
* Remove cell chemistry, increase tiering of recipes from mask-making process
* Fix LN2 and LOX in LINAC and Synchrotron
* Fix Synchrotron structure definition antenna having a different meta to the actual block
* Fix Accelerator Glass Hardness
* Fix mobs spawning inside Synchrotron, make LiB6 rods less painful to make
* Halve TC base recipe duration, loosen focus requirements for lower-tier wafers, add more detail to LINAC TT
* Improve LINAC output energy eu/t scaling
* Remove log
* Spotless
* Remove merge artifact
* Spotless apply for branch beamline-fixes-2 for #2899 (#2900)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Diffstat (limited to 'src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe')
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeLoader.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeLoader.java index 5b2ca7b650..2c5eef4ea0 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeLoader.java @@ -22,7 +22,7 @@ import gtPlusPlus.core.material.ELEMENT; public class BeamlineRecipeLoader { - public static final HashMap<Fluid, Fluid> coolantMap = new HashMap<>(); + public static final HashMap<String, Fluid> coolantMap = new HashMap<>(); private static final ItemList[] VIABLE_WAFERS = new ItemList[] { ItemList.Circuit_Silicon_Wafer, ItemList.Circuit_Silicon_Wafer2, ItemList.Circuit_Silicon_Wafer3, ItemList.Circuit_Silicon_Wafer4, @@ -36,18 +36,21 @@ public class BeamlineRecipeLoader { coolantMap.put( Materials.LiquidNitrogen.getGas(1L) - .getFluid(), + .getFluid() + .getName(), Materials.Nitrogen.getGas(1L) .getFluid()); coolantMap.put( Materials.LiquidOxygen.getGas(1L) - .getFluid(), + .getFluid() + .getName(), Materials.Oxygen.getGas(1L) .getFluid()); - coolantMap.put(FluidRegistry.getFluid("ic2coolant"), FluidRegistry.getFluid("ic2hotcoolant")); + coolantMap.put("ic2coolant", FluidRegistry.getFluid("ic2hotcoolant")); coolantMap.put( Materials.SuperCoolant.getFluid(1L) - .getFluid(), + .getFluid() + .getName(), Materials.Water.getFluid(1L) .getFluid()); |