diff options
author | Martin Robertz <dream-master@gmx.net> | 2023-05-14 19:41:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-14 19:41:58 +0200 |
commit | 2b1d7a5a2982d595cbb7b0d143e2d87f509adf92 (patch) | |
tree | 5c39f76dfb6f91b86e06b5be7170af8983f32b64 /src/main/java | |
parent | 2d073ed19e0055eebc28e66dfae9110107e42836 (diff) | |
download | GT5-Unofficial-2b1d7a5a2982d595cbb7b0d143e2d87f509adf92.tar.gz GT5-Unofficial-2b1d7a5a2982d595cbb7b0d143e2d87f509adf92.tar.bz2 GT5-Unofficial-2b1d7a5a2982d595cbb7b0d143e2d87f509adf92.zip |
Fix infinity plate (#207)
* fix Large Infinity plates use TGregworks not Tcon mod
* update bs
* Update src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java
Co-authored-by: miozune <miozune@gmail.com>
* Merge branch 'fix-Infinity-Plate' into fix-Infinity-Plate-2
# Conflicts:
# src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java
* change if mod is loaded
* spotlessApply (#209)
Co-authored-by: GitHub GTNH Actions <>
* spotless
* spotlessApply (#210)
Co-authored-by: GitHub GTNH Actions <>
* remove infos about plates
* add gt material
* check if GG is loaded
* spotlessApply (#211)
Co-authored-by: GitHub GTNH Actions <>
* fix
* sa
* spotlessApply (#212)
Co-authored-by: GitHub GTNH Actions <>
* fix derp
* duct tape fix prevent crashing
* sa
* add missing import
* Fix Bedrockium
* oops
---------
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index 4b395f8f71..d3cd23d749 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -34,6 +34,7 @@ import net.minecraftforge.fluids.FluidStack; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.CustomItemList; +import com.rwtema.extrautils.ExtraUtils; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; @@ -54,10 +55,9 @@ public class ResearchStationAssemblyLine implements Runnable { itemPartsUIVAsslineRecipes(); itemPartsUMVAsslineRecipes(); itemPartsUXVAsslineRecipes(); - addWirelessEnergyRecipes(); - if (TinkersGregworks.isModLoaded()) { + if (TinkersGregworks.isModLoaded() && GoodGenerator.isModLoaded() && ExtraUtilities.isModLoaded()) { addEOHRecipes(); } @@ -2586,14 +2586,18 @@ public class ResearchStationAssemblyLine implements Runnable { } private void addEOHRecipes() { - Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null ? FluidRegistry.getFluid("molten.mutatedlivingsolder") : FluidRegistry.getFluid("molten.solderingalloy"); - - ItemStack largeShirabonPlate = TinkersGregworks.isModLoaded() - ? TGregUtils.newItemStack(Materials.get("Shirabon"), PartTypes.LargePlate, 1) - : GT_OreDictUnificator.get("plateDenseShirabon", 1); + ItemStack largeShirabonPlate = TGregUtils.newItemStack(Materials.get("Shirabon"), PartTypes.LargePlate, 1); + ItemStack largeInfinityPlate = TGregUtils.newItemStack(Materials.Infinity, PartTypes.LargePlate, 1); + ItemStack largeBedrockiumPlate = getModItem( + TinkerConstruct.ID, + "heavyPlate", + 1, + ExtraUtils.tcon_bedrock_material_id); + ItemStack largeCosmicNeutroniumPlate = TGregUtils + .newItemStack(Materials.CosmicNeutronium, PartTypes.LargePlate, 1); final FluidStack[] specialFluid = new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(1_440), MaterialsUEVplus.SpaceTime.getMolten(1_440), MaterialsUEVplus.SpaceTime.getMolten(1_440), @@ -2666,16 +2670,7 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(Avaritia.ID, "Resource_Block", 64, 0), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 64), GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Neutronium, 48), - - // Large Bedrockium Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 315), - // Large Cosmic Neutronium Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 1671), - // Large Shirabon Plate - largeShirabonPlate, - // Large Infinity Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 1669), - + largeBedrockiumPlate, largeCosmicNeutroniumPlate, largeShirabonPlate, largeInfinityPlate, // UV Solar panel getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0), ItemList.Quantum_Chest_IV.get(1), @@ -3158,16 +3153,8 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(Avaritia.ID, "Resource_Block", 64, 0), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 64), GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Neutronium, 48), - // Large Bedrockium Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 315), - // Large Cosmic Neutronium Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 1671), - // Large Shirabon Plate - largeShirabonPlate, - // Large Infinity Plate - getModItem(TinkerConstruct.ID, "heavyPlate", 1, 1669), - + largeBedrockiumPlate, largeCosmicNeutroniumPlate, largeShirabonPlate, largeInfinityPlate, // UV Solar panel getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0), // Ultimate Time Anomaly. |