diff options
| author | Raven Szewczyk <git@eigenraven.me> | 2024-05-24 19:00:07 +0100 |
|---|---|---|
| committer | Raven Szewczyk <git@eigenraven.me> | 2024-05-24 19:00:07 +0100 |
| commit | 9c07ac0bffe24963f4fd6f44d148e3dcea5b2fd7 (patch) | |
| tree | 187cb6af509bbcd09e751ff7c27cdf39dae05edc /src/main/java | |
| parent | fc1c9e3577d908bc16e7ed35375991893f309002 (diff) | |
| download | GT5-Unofficial-9c07ac0bffe24963f4fd6f44d148e3dcea5b2fd7.tar.gz GT5-Unofficial-9c07ac0bffe24963f4fd6f44d148e3dcea5b2fd7.tar.bz2 GT5-Unofficial-9c07ac0bffe24963f4fd6f44d148e3dcea5b2fd7.zip | |
Apply updated GT5 spotless config
Diffstat (limited to 'src/main/java')
205 files changed, 12489 insertions, 10032 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java index 4d28c5fb46..2eee530a70 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java @@ -47,12 +47,12 @@ public final class BioObjectAdder { * @return */ public static BioCulture createAndRegisterBioCulture(Color color, String name, BioPlasmid plasmid, BioDNA dna, - EnumRarity rarity, boolean breedable) { + EnumRarity rarity, boolean breedable) { if (BioCulture.BIO_CULTURE_ARRAY_LIST.size() > 1) return BioCulture.createAndRegisterBioCulture(color, name, plasmid, dna, rarity, breedable); new Exception( - "Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + "Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!") + .printStackTrace(); return null; } @@ -67,12 +67,12 @@ public final class BioObjectAdder { * @return */ public static BioCulture createAndRegisterBioCulture(Color color, String name, BioPlasmid plasmid, BioDNA dna, - boolean breedable) { + boolean breedable) { if (BioCulture.BIO_CULTURE_ARRAY_LIST.size() > 1) return BioCulture.createAndRegisterBioCulture(color, name, plasmid, dna, breedable); new Exception( - "Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + "Too Early to register a BioCulture! You MUST run this either after:bartworks OR in the init Phase!") + .printStackTrace(); return null; } @@ -89,7 +89,7 @@ public final class BioObjectAdder { if (BioData.BIO_DATA_ARRAY_LIST.size() > 1) return BioData.createAndRegisterBioData(aName, rarity, chance, tier); new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + .printStackTrace(); return null; } @@ -103,7 +103,7 @@ public final class BioObjectAdder { public static BioDNA createAndRegisterBioDNA(String aName, EnumRarity rarity) { if (BioData.BIO_DATA_ARRAY_LIST.size() > 1) return BioDNA.createAndRegisterBioDNA(aName, rarity); new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + .printStackTrace(); return null; } @@ -117,7 +117,7 @@ public final class BioObjectAdder { public static BioPlasmid createAndRegisterBioPlasmid(String aName, EnumRarity rarity) { if (BioData.BIO_DATA_ARRAY_LIST.size() > 1) return BioPlasmid.createAndRegisterBioPlasmid(aName, rarity); new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + .printStackTrace(); return null; } @@ -131,7 +131,7 @@ public final class BioObjectAdder { public static BioDNA createAndRegisterBioDNA(String aName, EnumRarity rarity, int chance, int tier) { if (BioData.BIO_DATA_ARRAY_LIST.size() > 1) return BioDNA.createAndRegisterBioDNA(aName, rarity, chance, tier); new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + .printStackTrace(); return null; } @@ -146,7 +146,7 @@ public final class BioObjectAdder { if (BioData.BIO_DATA_ARRAY_LIST.size() > 1) return BioPlasmid.createAndRegisterBioPlasmid(aName, rarity, chance, tier); new Exception("Too Early to register a BioData! You MUST run this either after:bartworks OR in the init Phase!") - .printStackTrace(); + .printStackTrace(); return null; } @@ -164,20 +164,33 @@ public final class BioObjectAdder { */ public static void regenerateBioFluids() { FluidStack dnaFluid = Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 100) - : Materials.Biomass.getFluid(100L); + : Materials.Biomass.getFluid(100L); for (BioCulture B : BioCulture.BIO_CULTURE_ARRAY_LIST) { if (B.getFluidNotSet()) { B.setFluid( - GT_FluidFactory.builder(B.getName().replace(" ", "").toLowerCase() + "fluid") - .withTextureName("molten.autogenerated") - .withColorRGBA( - new short[] { (short) B.getColor().getRed(), (short) B.getColor().getBlue(), - (short) B.getColor().getGreen() }) - .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid()); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)) - .fluidInputs(new FluidStack(B.getFluid(), 1000)).fluidOutputs(dnaFluid).duration(25 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(centrifugeRecipes); + GT_FluidFactory.builder( + B.getName() + .replace(" ", "") + .toLowerCase() + "fluid") + .withTextureName("molten.autogenerated") + .withColorRGBA( + new short[] { (short) B.getColor() + .getRed(), + (short) B.getColor() + .getBlue(), + (short) B.getColor() + .getGreen() }) + .withStateAndTemperature(FluidState.LIQUID, 300) + .buildAndRegister() + .asFluid()); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(10)) + .fluidInputs(new FluidStack(B.getFluid(), 1000)) + .fluidOutputs(dnaFluid) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(centrifugeRecipes); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java index b1e3fb25df..6ab854c308 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java @@ -31,18 +31,18 @@ public final class BioRecipeAdder { public static final int CLEANROOM = -200; public static boolean addBioLabRecipe(ItemStack[] aInputs, ItemStack aOutput, ItemStack aSpecialItems, - int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, - int aSpecialValue) { + int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, + int aSpecialValue) { return BWRecipes.instance.addBioLabRecipe( - aInputs, - aOutput, - aSpecialItems, - aChances, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - aSpecialValue); + aInputs, + aOutput, + aSpecialItems, + aChances, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + aSpecialValue); } /** @@ -58,9 +58,9 @@ public final class BioRecipeAdder { * @return if the recipe was added. */ public static boolean addBioLabRecipeIncubation(ItemStack aInput, BioCulture aOutput, int[] aChances, - FluidStack aFluidInputs, int aDuration, int aEUt, int aSpecialValue) { + FluidStack aFluidInputs, int aDuration, int aEUt, int aSpecialValue) { return BWRecipes.instance - .addBioLabRecipeIncubation(aInput, aOutput, aChances, aFluidInputs, aDuration, aEUt, aSpecialValue); + .addBioLabRecipeIncubation(aInput, aOutput, aChances, aFluidInputs, aDuration, aEUt, aSpecialValue); } /** @@ -78,19 +78,19 @@ public final class BioRecipeAdder { * @return */ public static boolean addBacterialVatRecipe(ItemStack[] aInputs, @Nonnull BioCulture aCulture, - @Nonnull FluidStack[] aFluidInputs, @Nonnull FluidStack[] aFluidOutputs, @Nonnegative int aDuration, - @Nonnegative int aEUt, int Sv, @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { + @Nonnull FluidStack[] aFluidInputs, @Nonnull FluidStack[] aFluidOutputs, @Nonnegative int aDuration, + @Nonnegative int aEUt, int Sv, @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { return BWRecipes.instance.addBacterialVatRecipe( - aInputs, - aCulture, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - Sv, - glasTier, - aSpecialValue, - exactSv); + aInputs, + aCulture, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + Sv, + glasTier, + aSpecialValue, + exactSv); } /** @@ -109,18 +109,18 @@ public final class BioRecipeAdder { */ @Deprecated public static boolean addBacterialVatRecipe(ItemStack[] aInputs, @Nonnull BioCulture aCulture, - @Nonnull FluidStack[] aFluidInputs, @Nonnull FluidStack[] aFluidOutputs, @Nonnegative int aDuration, - @Nonnegative int aEUt, Materials material, @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { + @Nonnull FluidStack[] aFluidInputs, @Nonnull FluidStack[] aFluidOutputs, @Nonnegative int aDuration, + @Nonnegative int aEUt, Materials material, @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { return BWRecipes.instance.addBacterialVatRecipe( - aInputs, - aCulture, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - material, - glasTier, - aSpecialValue, - exactSv); + aInputs, + aCulture, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + material, + glasTier, + aSpecialValue, + exactSv); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java index 4084f485ab..b53638a77a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java @@ -56,17 +56,17 @@ public final class BioVatLogicAdder { giveItemStackRadioHatchAbilites(ItemList.Uraniumcell_4.get(1), Materials.Uranium, 12); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.TiberiumCell_1.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 3); + BW_NonMeta_MaterialItems.TiberiumCell_1.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 3); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.TiberiumCell_2.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 6); + BW_NonMeta_MaterialItems.TiberiumCell_2.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 6); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.TiberiumCell_4.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 12); + BW_NonMeta_MaterialItems.TiberiumCell_4.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 12); giveItemStackRadioHatchAbilites(BW_NonMeta_MaterialItems.TheCoreCell.get(1), Materials.Naquadah, 96); @@ -79,58 +79,58 @@ public final class BioVatLogicAdder { giveItemStackRadioHatchAbilites(ItemList.Depleted_Naquadah_4.get(1), Materials.Naquadah, 12, 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXSimpledepleted", 1), - Materials.Plutonium, - 3, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXSimpledepleted", 1), + Materials.Plutonium, + 3, + 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXDualdepleted", 1), - Materials.Plutonium, - 6, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXDualdepleted", 1), + Materials.Plutonium, + 6, + 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXQuaddepleted", 1), - Materials.Plutonium, - 12, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXQuaddepleted", 1), + Materials.Plutonium, + 12, + 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumSimpledepleted", 1), - Materials.Uranium, - 3, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumSimpledepleted", 1), + Materials.Uranium, + 3, + 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumDualdepleted", 1), - Materials.Uranium, - 6, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumDualdepleted", 1), + Materials.Uranium, + 6, + 10); giveItemStackRadioHatchAbilites( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumQuaddepleted", 1), - Materials.Uranium, - 12, - 10); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumQuaddepleted", 1), + Materials.Uranium, + 12, + 10); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 3, - 10); + BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 3, + 10); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 6, - 10); + BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 6, + 10); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1), - WerkstoffLoader.Tiberium.getBridgeMaterial(), - 12, - 10); + BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1), + WerkstoffLoader.Tiberium.getBridgeMaterial(), + 12, + 10); giveItemStackRadioHatchAbilites( - BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1), - Materials.Naquadah, - 96, - 10); + BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1), + Materials.Naquadah, + 96, + 10); giveItemStackRadioHatchAbilites(ItemList.MNqCell_1.get(1), Materials.Naquadria, 3); giveItemStackRadioHatchAbilites(ItemList.MNqCell_2.get(1), Materials.Naquadria, 6); @@ -223,7 +223,7 @@ public final class BioVatLogicAdder { boolean ret = block != null; if (ret) BioVatGlass.glasses.put(new BlockMetaPair(block, (byte) meta), (byte) tier); else new IllegalArgumentException( - "Block: " + sUnlocBlockName + " of the Mod: " + sModname + " was NOT found!").printStackTrace(); + "Block: " + sUnlocBlockName + " of the Mod: " + sModname + " was NOT found!").printStackTrace(); block = null; return ret; } @@ -274,7 +274,7 @@ public final class BioVatLogicAdder { if (o == null || this.getClass() != o.getClass()) return false; BioVatLogicAdder.MaterialSvPair that = (BioVatLogicAdder.MaterialSvPair) o; return Objects.equals(this.getMaterials(), that.getMaterials()) - && Objects.equals(this.getSievert(), that.getSievert()); + && Objects.equals(this.getSievert(), that.getSievert()); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java index 764340af42..eb4c2a0405 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BorosilicateGlass.java @@ -62,7 +62,7 @@ public class BorosilicateGlass { } private static void doRegister(byte level, Block block, int meta, - SetMultimap<Byte, Pair<Block, Integer>> allLevels) { + SetMultimap<Byte, Pair<Block, Integer>> allLevels) { allLevels.put(level, Pair.of(block, meta)); allLevelsReverse.put(block, meta, level); } @@ -96,7 +96,10 @@ public class BorosilicateGlass { SetMultimap<Byte, Pair<Block, Integer>> allLevels = getAllLevels(); ArrayList<Pair<Block, Integer>> ret = new ArrayList<>(); for (Byte level : new PriorityQueue<>(allLevels.keySet())) { - ret.add(allLevels.get(level).iterator().next()); + ret.add( + allLevels.get(level) + .iterator() + .next()); } representatives = ret; } @@ -115,10 +118,10 @@ public class BorosilicateGlass { * Can only be called at INIT stage. */ public static void registerGlass(Block block, int meta, byte tier) { - if (Loader.instance().hasReachedState(LoaderState.POSTINITIALIZATION)) - throw new IllegalStateException("register too late!"); - if (!Loader.instance().hasReachedState(LoaderState.INITIALIZATION)) - throw new IllegalStateException("register too early!"); + if (Loader.instance() + .hasReachedState(LoaderState.POSTINITIALIZATION)) throw new IllegalStateException("register too late!"); + if (!Loader.instance() + .hasReachedState(LoaderState.INITIALIZATION)) throw new IllegalStateException("register too early!"); if (!isValidTier(tier)) throw new IllegalArgumentException("not a valid tier: " + tier); doRegister(tier, block, meta, getAllLevels()); } @@ -167,9 +170,9 @@ public class BorosilicateGlass { * @param initialValue the value set before structure check started */ public static <T> IStructureElement<T> ofBoroGlass(byte initialValue, BiConsumer<T, Byte> setter, - Function<T, Byte> getter) { + Function<T, Byte> getter) { return lazy( - t -> ofBlocksTiered(BorosilicateGlass::getTier, getRepresentatives(), initialValue, setter, getter)); + t -> ofBlocksTiered(BorosilicateGlass::getTier, getRepresentatives(), initialValue, setter, getter)); } /** @@ -181,16 +184,18 @@ public class BorosilicateGlass { * @param maxTier maximal accepted tier. inclusive. */ public static <T> IStructureElement<T> ofBoroGlass(byte initialValue, byte minTier, byte maxTier, - BiConsumer<T, Byte> setter, Function<T, Byte> getter) { + BiConsumer<T, Byte> setter, Function<T, Byte> getter) { if (minTier > maxTier || minTier < 0) throw new IllegalArgumentException(); return lazy( - t -> ofBlocksTiered( - (block1, meta) -> checkWithinBound(getTier(block1, meta), minTier, maxTier), - getRepresentatives().stream().skip(Math.max(minTier - 3, 0)).limit(maxTier - minTier + 1) - .collect(Collectors.toList()), - initialValue, - setter, - getter)); + t -> ofBlocksTiered( + (block1, meta) -> checkWithinBound(getTier(block1, meta), minTier, maxTier), + getRepresentatives().stream() + .skip(Math.max(minTier - 3, 0)) + .limit(maxTier - minTier + 1) + .collect(Collectors.toList()), + initialValue, + setter, + getter)); } /** diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/SideReference.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/SideReference.java index 041096d4f6..88ae5bf5c0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/SideReference.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/SideReference.java @@ -19,13 +19,21 @@ public class SideReference { public static class EffectiveSide { - public static final boolean Server = FMLCommonHandler.instance().getEffectiveSide().isServer(); - public static final boolean Client = FMLCommonHandler.instance().getEffectiveSide().isClient(); + public static final boolean Server = FMLCommonHandler.instance() + .getEffectiveSide() + .isServer(); + public static final boolean Client = FMLCommonHandler.instance() + .getEffectiveSide() + .isClient(); } public static class Side { - public static final boolean Server = FMLCommonHandler.instance().getSide().isServer(); - public static final boolean Client = FMLCommonHandler.instance().getSide().isClient(); + public static final boolean Server = FMLCommonHandler.instance() + .getSide() + .isServer(); + public static final boolean Client = FMLCommonHandler.instance() + .getSide() + .isClient(); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAPI.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAPI.java index 17a33e768d..01c172382f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAPI.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAPI.java @@ -29,6 +29,7 @@ public final class WerkstoffAPI { } public static Werkstoff getWerkstoff(String aName) throws NoSuchFieldException, IllegalAccessException { - return (Werkstoff) w.getField(aName).get(null); + return (Werkstoff) w.getField(aName) + .get(null); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/modularUI/BW_UITextures.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/modularUI/BW_UITextures.java index 8d8f5c1778..620e9d65af 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/modularUI/BW_UITextures.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/modularUI/BW_UITextures.java @@ -11,9 +11,9 @@ import com.gtnewhorizons.modularui.api.drawable.UITexture; public class BW_UITextures { public static final AdaptableUITexture BACKGROUND_BROWN = AdaptableUITexture - .of(MOD_ID, "GUI/background/brown", 176, 166, 3); + .of(MOD_ID, "GUI/background/brown", 176, 166, 3); public static final UITexture BACKGROUND_CIRCUIT_PROGRAMMER = UITexture - .fullImage(MOD_ID, "GUI/background/circuit_programmer"); + .fullImage(MOD_ID, "GUI/background/circuit_programmer"); public static final AdaptableUITexture SLOT_BROWN = AdaptableUITexture.of(MOD_ID, "GUI/slot/brown", 18, 18, 1); @@ -25,36 +25,37 @@ public class BW_UITextures { public static final UITexture PROGRESSBAR_SIEVERT = UITexture.fullImage(MOD_ID, "GUI/progressbar/sievert"); public static final UITexture PROGRESSBAR_STORED_EU_116 = UITexture - .fullImage(MOD_ID, "GUI/progressbar/stored_eu_116"); + .fullImage(MOD_ID, "GUI/progressbar/stored_eu_116"); public static final UITexture PROGRESSBAR_FUEL = UITexture.fullImage(MOD_ID, "GUI/progressbar/fuel"); public static final UITexture PICTURE_BW_LOGO_47X21 = UITexture.fullImage(MOD_ID, "GUI/picture/bw_logo_47x21"); public static final UITexture PICTURE_SIEVERT_CONTAINER = UITexture - .fullImage(MOD_ID, "GUI/picture/sievert_container"); + .fullImage(MOD_ID, "GUI/picture/sievert_container"); public static final UITexture PICTURE_DECAY_TIME_CONTAINER = UITexture - .fullImage(MOD_ID, "GUI/picture/decay_time_container"); + .fullImage(MOD_ID, "GUI/picture/decay_time_container"); public static final UITexture PICTURE_DECAY_TIME_INSIDE = UITexture - .fullImage(MOD_ID, "GUI/picture/decay_time_inside"); + .fullImage(MOD_ID, "GUI/picture/decay_time_inside"); public static final UITexture PICTURE_RADIATION = UITexture.fullImage(MOD_ID, "GUI/picture/radiation"); public static final UITexture PICTURE_WINDMILL_EMPTY = UITexture.fullImage(MOD_ID, "GUI/picture/windmill_empty"); - public static final UITexture[] PICTURE_WINDMILL_ROTATING = IntStream.range(0, 4).mapToObj( - i -> UITexture.partly(MOD_ID, "GUI/picture/windmill_rotating", 32, 128, 0, i * 32, 32, (i + 1) * 32)) - .collect(Collectors.toList()).toArray(new UITexture[0]); + public static final UITexture[] PICTURE_WINDMILL_ROTATING = IntStream.range(0, 4) + .mapToObj(i -> UITexture.partly(MOD_ID, "GUI/picture/windmill_rotating", 32, 128, 0, i * 32, 32, (i + 1) * 32)) + .collect(Collectors.toList()) + .toArray(new UITexture[0]); public static final UITexture PICTURE_STORED_EU_FRAME = UITexture.fullImage(MOD_ID, "GUI/picture/stored_eu_frame"); public static final UITexture PICTURE_RADIATION_SHUTTER_FRAME = UITexture - .fullImage(MOD_ID, "GUI/picture/radiation_shutter_frame"); + .fullImage(MOD_ID, "GUI/picture/radiation_shutter_frame"); public static final AdaptableUITexture PICTURE_RADIATION_SHUTTER_INSIDE = AdaptableUITexture - .of(MOD_ID, "GUI/picture/radiation_shutter_inside", 51, 48, 1); + .of(MOD_ID, "GUI/picture/radiation_shutter_inside", 51, 48, 1); public static final AdaptableUITexture TAB_TITLE_BROWN = AdaptableUITexture - .of(MOD_ID, "GUI/tab/title_brown", 28, 28, 4); + .of(MOD_ID, "GUI/tab/title_brown", 28, 28, 4); public static final AdaptableUITexture TAB_TITLE_DARK_BROWN = AdaptableUITexture - .of(MOD_ID, "GUI/tab/title_dark_brown", 28, 28, 4); + .of(MOD_ID, "GUI/tab/title_dark_brown", 28, 28, 4); public static final AdaptableUITexture TAB_TITLE_ANGULAR_BROWN = AdaptableUITexture - .of(MOD_ID, "GUI/tab/title_angular_brown", 28, 28, 4); + .of(MOD_ID, "GUI/tab/title_angular_brown", 28, 28, 4); public static final UITexture OVERLAY_BUTTON_ASSEMBLER_MODE = UITexture - .fullImage(MOD_ID, "GUI/overlay_button/assembler_mode"); + .fullImage(MOD_ID, "GUI/overlay_button/assembler_mode"); public static final UITexture OVERLAY_BUTTON_LINE_MODE = UITexture - .fullImage(MOD_ID, "GUI/overlay_button/line_mode"); + .fullImage(MOD_ID, "GUI/overlay_button/line_mode"); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BacterialVatFrontend.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BacterialVatFrontend.java index 6ed4113017..01cf2ecd32 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BacterialVatFrontend.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BacterialVatFrontend.java @@ -24,15 +24,15 @@ import gregtech.nei.formatter.INEISpecialInfoFormatter; public class BacterialVatFrontend extends RecipeMapFrontend { public BacterialVatFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super( - uiPropertiesBuilder, - neiPropertiesBuilder.neiSpecialInfoFormatter(new BacterialVatSpecialValueFormatter())); + uiPropertiesBuilder, + neiPropertiesBuilder.neiSpecialInfoFormatter(new BacterialVatSpecialValueFormatter())); } @Override protected List<String> handleNEIItemInputTooltip(List<String> currentTip, - GT_NEI_DefaultHandler.FixedPositionedStack pStack) { + GT_NEI_DefaultHandler.FixedPositionedStack pStack) { if (pStack.isFluid()) { currentTip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("nei.biovat.input.tooltip")); return currentTip; @@ -42,7 +42,7 @@ public class BacterialVatFrontend extends RecipeMapFrontend { @Override protected List<String> handleNEIItemOutputTooltip(List<String> currentTip, - GT_NEI_DefaultHandler.FixedPositionedStack pStack) { + GT_NEI_DefaultHandler.FixedPositionedStack pStack) { if (pStack.isFluid()) { currentTip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("nei.biovat.output.tooltip")); return currentTip; @@ -63,12 +63,12 @@ public class BacterialVatFrontend extends RecipeMapFrontend { private void drawFluidOverlay(GT_NEI_DefaultHandler.FixedPositionedStack stack) { if (stack.isFluid()) { drawNEIOverlayText( - "+", - stack, - colorOverride.getTextColorOrDefault("nei_overlay_yellow", 0xFDD835), - 0.5f, - true, - Alignment.TopRight); + "+", + stack, + colorOverride.getTextColorOrDefault("nei_overlay_yellow", 0xFDD835), + 0.5f, + true, + Alignment.TopRight); return; } super.drawNEIOverlayForOutput(stack); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BartWorksRecipeMaps.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BartWorksRecipeMaps.java index 97fa74bf85..281184893c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BartWorksRecipeMaps.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/BartWorksRecipeMaps.java @@ -12,53 +12,80 @@ import gregtech.nei.formatter.FuelSpecialValueFormatter; public class BartWorksRecipeMaps { public static final RecipeMap<RecipeMapBackend> bioLabRecipes = RecipeMapBuilder.of("bw.recipe.biolab") - .maxIO(6, 2, 1, 0).minInputs(1, 1).useSpecialSlot().slotOverlays((index, isFluid, isOutput, isSpecial) -> { - if (isSpecial) { - return BW_UITextures.OVERLAY_SLOT_MODULE; + .maxIO(6, 2, 1, 0) + .minInputs(1, 1) + .useSpecialSlot() + .slotOverlays((index, isFluid, isOutput, isSpecial) -> { + if (isSpecial) { + return BW_UITextures.OVERLAY_SLOT_MODULE; + } + if (isFluid) { + return GT_UITextures.OVERLAY_SLOT_VIAL_2; + } + if (!isOutput) { + switch (index) { + case 0: + return BW_UITextures.OVERLAY_SLOT_DISH; + case 1: + return BW_UITextures.OVERLAY_SLOT_DNA_FLASK; + case 2: + return GT_UITextures.OVERLAY_SLOT_CIRCUIT; + case 3: + return GT_UITextures.OVERLAY_SLOT_MOLECULAR_1; + case 4: + return GT_UITextures.OVERLAY_SLOT_MOLECULAR_2; + case 5: + return GT_UITextures.OVERLAY_SLOT_DATA_ORB; } - if (isFluid) { - return GT_UITextures.OVERLAY_SLOT_VIAL_2; - } - if (!isOutput) { - switch (index) { - case 0: - return BW_UITextures.OVERLAY_SLOT_DISH; - case 1: - return BW_UITextures.OVERLAY_SLOT_DNA_FLASK; - case 2: - return GT_UITextures.OVERLAY_SLOT_CIRCUIT; - case 3: - return GT_UITextures.OVERLAY_SLOT_MOLECULAR_1; - case 4: - return GT_UITextures.OVERLAY_SLOT_MOLECULAR_2; - case 5: - return GT_UITextures.OVERLAY_SLOT_DATA_ORB; - } - } - return null; - }).progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE).logo(BW_UITextures.PICTURE_BW_LOGO_47X21) - .logoSize(47, 21).logoPos(125, 3).disableRegisterNEI().build(); + } + return null; + }) + .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .logo(BW_UITextures.PICTURE_BW_LOGO_47X21) + .logoSize(47, 21) + .logoPos(125, 3) + .disableRegisterNEI() + .build(); public static final RecipeMap<RecipeMapBackend> bacterialVatRecipes = RecipeMapBuilder.of("bw.recipe.BacteriaVat") - .maxIO(6, 2, 1, 1).minInputs(0, 1).useSpecialSlot().specialSlotSensitive() - .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE).frontend(BacterialVatFrontend::new) - .disableRegisterNEI().build(); + .maxIO(6, 2, 1, 1) + .minInputs(0, 1) + .useSpecialSlot() + .specialSlotSensitive() + .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .frontend(BacterialVatFrontend::new) + .disableRegisterNEI() + .build(); public static final RecipeMap<FuelBackend> acidGenFuels = RecipeMapBuilder.of("bw.fuels.acidgens", FuelBackend::new) - .maxIO(1, 1, 0, 0).neiSpecialInfoFormatter(FuelSpecialValueFormatter.INSTANCE).build(); + .maxIO(1, 1, 0, 0) + .neiSpecialInfoFormatter(FuelSpecialValueFormatter.INSTANCE) + .build(); public static final RecipeMap<RecipeMapBackend> circuitAssemblyLineRecipes = RecipeMapBuilder.of("bw.recipe.cal") - .maxIO(6, 1, 1, 0).minInputs(1, 1).useSpecialSlot().specialSlotSensitive() - .progressBar(GT_UITextures.PROGRESSBAR_CIRCUIT_ASSEMBLER).build(); + .maxIO(6, 1, 1, 0) + .minInputs(1, 1) + .useSpecialSlot() + .specialSlotSensitive() + .progressBar(GT_UITextures.PROGRESSBAR_CIRCUIT_ASSEMBLER) + .build(); public static final RecipeMap<RecipeMapBackend> radioHatchRecipes = RecipeMapBuilder.of("bw.recipe.radhatch") - .maxIO(1, 0, 0, 0).minInputs(1, 0) - .slotOverlays((index, isFluid, isOutput, isSpecial) -> BW_UITextures.OVERLAY_SLOT_ROD) - .logo(BW_UITextures.PICTURE_BW_LOGO_47X21).logoSize(47, 21).logoPos(118, 55).dontUseProgressBar() - .addSpecialTexture(74, 20, 29, 27, BW_UITextures.PICTURE_RADIATION).frontend(RadioHatchFrontend::new) - .build(); + .maxIO(1, 0, 0, 0) + .minInputs(1, 0) + .slotOverlays((index, isFluid, isOutput, isSpecial) -> BW_UITextures.OVERLAY_SLOT_ROD) + .logo(BW_UITextures.PICTURE_BW_LOGO_47X21) + .logoSize(47, 21) + .logoPos(118, 55) + .dontUseProgressBar() + .addSpecialTexture(74, 20, 29, 27, BW_UITextures.PICTURE_RADIATION) + .frontend(RadioHatchFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> electricImplosionCompressorRecipes = RecipeMapBuilder - .of("gt.recipe.electricimplosioncompressor").maxIO(6, 2, 1, 1) - .slotOverlays( - (index, isFluid, isOutput, - isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_IMPLOSION : null) - .progressBar(GT_UITextures.PROGRESSBAR_COMPRESS).build(); + .of("gt.recipe.electricimplosioncompressor") + .maxIO(6, 2, 1, 1) + .slotOverlays( + (index, isFluid, isOutput, isSpecial) -> !isFluid && !isOutput ? GT_UITextures.OVERLAY_SLOT_IMPLOSION + : null) + .progressBar(GT_UITextures.PROGRESSBAR_COMPRESS) + .build(); public static final RecipeMap<RecipeMapBackend> htgrFakeRecipes = RecipeMapBuilder.of("bw.recipe.htgr") - .maxIO(1, 1, 0, 0).build(); + .maxIO(1, 1, 0, 0) + .build(); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/DynamicGTRecipe.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/DynamicGTRecipe.java index 3087255e51..d409d3ab26 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/DynamicGTRecipe.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/DynamicGTRecipe.java @@ -12,19 +12,19 @@ import gregtech.api.util.GT_Recipe; public class DynamicGTRecipe extends GT_Recipe { public DynamicGTRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, - int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, - int aSpecialValue, GT_Recipe originalRecipe) { + int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, + int aSpecialValue, GT_Recipe originalRecipe) { super( - aOptimize, - aInputs, - aOutputs, - aSpecialItems, - aChances, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - aSpecialValue); + aOptimize, + aInputs, + aOutputs, + aSpecialItems, + aChances, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + aSpecialValue); if (originalRecipe != null) { this.owners = new ArrayList<>(originalRecipe.owners); this.stackTraces = new ArrayList<>(originalRecipe.stackTraces); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/RadioHatchFrontend.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/RadioHatchFrontend.java index 0309a676d9..a6cf4b180e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/RadioHatchFrontend.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/recipe/RadioHatchFrontend.java @@ -19,7 +19,7 @@ import gregtech.nei.formatter.INEISpecialInfoFormatter; public class RadioHatchFrontend extends RecipeMapFrontend { public RadioHatchFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super(uiPropertiesBuilder, neiPropertiesBuilder.neiSpecialInfoFormatter(new RadioHatchSpecialInfoFormatter())); } @@ -37,9 +37,9 @@ public class RadioHatchFrontend extends RecipeMapFrontend { int amount = recipeInfo.recipe.mDuration; long time = recipeInfo.recipe.mSpecialValue; return Arrays.asList( - StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.0", radioLevel), - StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.1", amount), - StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.2", time * amount / 20.0)); + StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.0", radioLevel), + StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.1", amount), + StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.2", time * amount / 20.0)); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java index 7227780e37..f7fde1167d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java @@ -66,7 +66,8 @@ public class BWCorePlugin implements IFMLLoadingPlugin { } if (data.get("coremodList") != null) { for (Object o : (ArrayList) data.get("coremodList")) { - if (o.toString().contains("MicdoodlePlugin")) { + if (o.toString() + .contains("MicdoodlePlugin")) { BWCoreTransformer.shouldTransform[2] = ConfigHandler.enabledPatches[2]; break; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java index 8d3fe4876c..38a5a70d27 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java @@ -31,7 +31,7 @@ import com.github.bartimaeusnek.bartworks.util.accessprioritylist.AccessPriority public class BWCoreStaticReplacementMethodes { private static ThreadLocal<AccessPriorityList<IRecipe>> RECENTLYUSEDRECIPES = ThreadLocal - .withInitial(AccessPriorityList::new); + .withInitial(AccessPriorityList::new); public static void clearRecentlyUsedRecipes() { // the easiest way to ensure the cache is flushed without causing synchronization overhead @@ -58,9 +58,10 @@ public class BWCoreStaticReplacementMethodes { } if (i == 2 && itemstack.getItem() == itemstack1.getItem() - && itemstack.stackSize == 1 - && itemstack1.stackSize == 1 - && itemstack.getItem().isRepairable()) { + && itemstack.stackSize == 1 + && itemstack1.stackSize == 1 + && itemstack.getItem() + .isRepairable()) { Item item = itemstack.getItem(); int j1 = item.getMaxDamage() - itemstack.getItemDamageForDisplay(); int k = item.getMaxDamage() - itemstack1.getItemDamageForDisplay(); @@ -87,7 +88,8 @@ public class BWCoreStaticReplacementMethodes { } HashSet<IRecipe> recipeSet = new NonNullWrappedHashSet<>(); - List<IRecipe> recipeList = CraftingManager.getInstance().getRecipeList(); + List<IRecipe> recipeList = CraftingManager.getInstance() + .getRecipeList(); for (IRecipe r : recipeList) { if (r.matches(inventoryCrafting, world)) recipeSet.add(r); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java index 095273676b..02835e39c2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java @@ -46,13 +46,12 @@ import org.objectweb.asm.tree.VarInsnNode; public class BWCoreTransformer implements IClassTransformer { public static final String[] DESCRIPTIONFORCONFIG = { "REMOVING RAIN FROM LAST MILLENNIUM (EXU)", - "REMOVING CREATURES FROM LAST MILLENNIUM (EXU)", - "PATCHING THAUMCRAFT WAND PEDESTAL TO PREVENT VIS DUPLICATION", - "PATCHING CRAFTING MANAGER FOR CACHING RECIPES" }; + "REMOVING CREATURES FROM LAST MILLENNIUM (EXU)", "PATCHING THAUMCRAFT WAND PEDESTAL TO PREVENT VIS DUPLICATION", + "PATCHING CRAFTING MANAGER FOR CACHING RECIPES" }; public static final String[] CLASSESBEINGTRANSFORMED = { - "com.rwtema.extrautils.worldgen.endoftime.WorldProviderEndOfTime", - "com.rwtema.extrautils.worldgen.endoftime.ChunkProviderEndOfTime", - "thaumcraft.common.tiles.TileWandPedestal", "net.minecraft.item.crafting.CraftingManager" }; + "com.rwtema.extrautils.worldgen.endoftime.WorldProviderEndOfTime", + "com.rwtema.extrautils.worldgen.endoftime.ChunkProviderEndOfTime", "thaumcraft.common.tiles.TileWandPedestal", + "net.minecraft.item.crafting.CraftingManager" }; static boolean obfs; public static boolean[] shouldTransform = new boolean[BWCoreTransformer.CLASSESBEINGTRANSFORMED.length]; @@ -72,19 +71,19 @@ public class BWCoreTransformer implements IClassTransformer { LabelNode label = new LabelNode(); nu.insertBefore(beginning, new VarInsnNode(ALOAD, 0)); nu.insertBefore( - beginning, - new FieldInsnNode( - GETFIELD, - "thaumcraft/common/tiles/TileWandPedestal", - obfs ? "field_145850_b" : "worldObj", - "Lnet/minecraft/world/World;")); + beginning, + new FieldInsnNode( + GETFIELD, + "thaumcraft/common/tiles/TileWandPedestal", + obfs ? "field_145850_b" : "worldObj", + "Lnet/minecraft/world/World;")); nu.insertBefore( - beginning, - new FieldInsnNode( - GETFIELD, - "net/minecraft/world/World", - obfs ? "field_72995_K" : "isRemote", - "Z")); + beginning, + new FieldInsnNode( + GETFIELD, + "net/minecraft/world/World", + obfs ? "field_72995_K" : "isRemote", + "Z")); nu.insertBefore(beginning, new JumpInsnNode(IFNE, label)); nu.add(new InsnNode(POP)); nu.add(label); @@ -99,7 +98,7 @@ public class BWCoreTransformer implements IClassTransformer { public static byte[] transform(int id, byte[] basicClass) { if (!BWCoreTransformer.shouldTransform[id]) { BWCore.BWCORE_LOG - .info("Patch: " + BWCoreTransformer.DESCRIPTIONFORCONFIG[id] + " is disabled, will not patch!"); + .info("Patch: " + BWCoreTransformer.DESCRIPTIONFORCONFIG[id] + " is disabled, will not patch!"); return basicClass; } @@ -143,7 +142,7 @@ public class BWCoreTransformer implements IClassTransformer { for (int i = 0; i < methods.size(); i++) { if (ASMUtils.isCorrectMethod(methods.get(i), name_deObfs, name_Obfs, name_src) - && ASMUtils.isCorrectMethod(methods.get(i), dsc_deObfs, dsc_Obfs)) { + && ASMUtils.isCorrectMethod(methods.get(i), dsc_deObfs, dsc_Obfs)) { BWCore.BWCORE_LOG.info("Found " + name_deObfs + "! Patching!"); MethodNode toPatch = methods.get(i); InsnList insnList = new InsnList(); @@ -166,7 +165,7 @@ public class BWCoreTransformer implements IClassTransformer { for (int i = 0; i < methods.size(); i++) { if (ASMUtils.isCorrectMethod(methods.get(i), name_deObfs, name_Obfs, name_src) - && ASMUtils.isCorrectMethod(methods.get(i), dsc_universal, dsc_universal)) { + && ASMUtils.isCorrectMethod(methods.get(i), dsc_universal, dsc_universal)) { BWCore.BWCORE_LOG.info("Found " + name_deObfs + "! Patching!"); methods.set(i, BWCoreTransformer.transformThaumcraftWandPedestal(methods.get(i))); break scase; @@ -184,12 +183,12 @@ public class BWCoreTransformer implements IClassTransformer { toPatch.instructions.add(new VarInsnNode(ALOAD, 1)); toPatch.instructions.add(new VarInsnNode(ALOAD, 2)); toPatch.instructions.add( - new MethodInsnNode( - INVOKESTATIC, - "com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes", - "findCachedMatchingRecipe", - "(Lnet/minecraft/inventory/InventoryCrafting;Lnet/minecraft/world/World;)Lnet/minecraft/item/ItemStack;", - false)); + new MethodInsnNode( + INVOKESTATIC, + "com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes", + "findCachedMatchingRecipe", + "(Lnet/minecraft/inventory/InventoryCrafting;Lnet/minecraft/world/World;)Lnet/minecraft/item/ItemStack;", + false)); toPatch.instructions.add(new InsnNode(ARETURN)); toPatch.localVariables.clear(); toPatch.maxStack = 2; @@ -220,7 +219,7 @@ public class BWCoreTransformer implements IClassTransformer { public byte[] transform(String name, String transformedName, byte[] basicClass) { for (int i = 0; i < BWCoreTransformer.CLASSESBEINGTRANSFORMED.length; i++) { if (name.equalsIgnoreCase(BWCoreTransformer.CLASSESBEINGTRANSFORMED[i]) - || transformedName.equalsIgnoreCase(BWCoreTransformer.CLASSESBEINGTRANSFORMED[i])) + || transformedName.equalsIgnoreCase(BWCoreTransformer.CLASSESBEINGTRANSFORMED[i])) return BWCoreTransformer.transform(i, basicClass); } return basicClass; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index fa04f66e28..818b67d6fc 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -81,16 +81,16 @@ import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.util.GT_OreDictUnificator; @Mod(modid = MainMod.MOD_ID, name = MainMod.NAME, version = API_REFERENCE.VERSION, dependencies = """ - required-after:IC2;\ - required-after:gregtech;\ - after:berriespp;\ - after:tectech;\ - after:GalacticraftMars;\ - after:GalacticraftCore;\ - after:Forestry;\ - after:ProjRed|Illumination;\ - after:RandomThings;\ - before:miscutils;""") + required-after:IC2;\ + required-after:gregtech;\ + after:berriespp;\ + after:tectech;\ + after:GalacticraftMars;\ + after:GalacticraftCore;\ + after:Forestry;\ + after:ProjRed|Illumination;\ + after:RandomThings;\ + before:miscutils;""") public final class MainMod { public static final String NAME = "BartWorks"; @@ -147,7 +147,9 @@ public final class MainMod { if (SideReference.Side.Server) { MinecraftForge.EVENT_BUS.register(serverEventHandler); } - FMLCommonHandler.instance().bus().register(serverEventHandler); + FMLCommonHandler.instance() + .bus() + .register(serverEventHandler); if (ConfigHandler.BioLab) { BioLabLoader.run(); } @@ -166,10 +168,15 @@ public final class MainMod { if (ConfigHandler.BioLab) { GTNHBlocks.run(); for (Map.Entry<BioVatLogicAdder.BlockMetaPair, Byte> pair : BioVatLogicAdder.BioVatGlass.getGlassMap() - .entrySet()) { + .entrySet()) { GT_OreDictUnificator.registerOre( - "blockGlass" + VN[pair.getValue()], - new ItemStack(pair.getKey().getBlock(), 1, pair.getKey().getaByte())); + "blockGlass" + VN[pair.getValue()], + new ItemStack( + pair.getKey() + .getBlock(), + 1, + pair.getKey() + .getaByte())); } } ArtificialMicaLine.runArtificialMicaRecipe(); @@ -224,6 +231,9 @@ public final class MainMod { // StaticRecipeChangeLoaders.synchroniseCircuitUseMulti(); // Accept recipe map changes into Buffers - RecipeMap.ALL_RECIPE_MAPS.values().forEach(map -> map.getBackend().reInit()); + RecipeMap.ALL_RECIPE_MAPS.values() + .forEach( + map -> map.getBackend() + .reInit()); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipCache.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipCache.java index a23020e787..969398df47 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipCache.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipCache.java @@ -37,7 +37,8 @@ class TooltipCache { sb.append(s); sb.append(System.lineSeparator()); } - char[] rettype = sb.toString().toCharArray(); + char[] rettype = sb.toString() + .toCharArray(); return TooltipCache.cache.put(p, rettype) == rettype; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java index 2b7e686814..9f7fb64e4b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/TooltipEventHandler.java @@ -53,38 +53,40 @@ public class TooltipEventHandler { if (event == null || event.itemStack == null || event.itemStack.getItem() == null) return; - if (TooltipCache.getTooltip(event.itemStack).isEmpty()) { + if (TooltipCache.getTooltip(event.itemStack) + .isEmpty()) { ItemStack tmp = event.itemStack.copy(); Pair<Integer, Short> abstractedStack = new Pair<>( - Item.getIdFromItem(tmp.getItem()), - (short) tmp.getItemDamage()); + Item.getIdFromItem(tmp.getItem()), + (short) tmp.getItemDamage()); List<String> tooAdd = new ArrayList<>(); - if (ConfigHandler.sharedItemStackTooltip && OreDictHandler.getNonBWCache().contains(abstractedStack)) { + if (ConfigHandler.sharedItemStackTooltip && OreDictHandler.getNonBWCache() + .contains(abstractedStack)) { for (Pair<Integer, Short> pair : OreDictHandler.getNonBWCache()) { if (pair.equals(abstractedStack)) { GameRegistry.UniqueIdentifier UI = GameRegistry.findUniqueIdentifierFor(tmp.getItem()); if (UI == null) UI = GameRegistry.findUniqueIdentifierFor(Block.getBlockFromItem(tmp.getItem())); if (UI != null) { - for (ModContainer modContainer : Loader.instance().getModList()) { + for (ModContainer modContainer : Loader.instance() + .getModList()) { if (MainMod.MOD_ID.equals(UI.modId) || BartWorksCrossmod.MOD_ID.equals(UI.modId) - || "BWCore".equals(UI.modId)) - break; + || "BWCore".equals(UI.modId)) break; if (UI.modId.equals(modContainer.getModId())) { tooAdd.add( - "Shared ItemStack between " + ChatColorHelper.DARKGREEN - + "BartWorks" - + ChatColorHelper.GRAY - + " and " - + ChatColorHelper.RED - + modContainer.getName()); + "Shared ItemStack between " + ChatColorHelper.DARKGREEN + + "BartWorks" + + ChatColorHelper.GRAY + + " and " + + ChatColorHelper.RED + + modContainer.getName()); } } } else tooAdd.add( - "Shared ItemStack between " + ChatColorHelper.DARKGREEN - + "BartWorks" - + ChatColorHelper.GRAY - + " and another Mod, that doesn't use the ModContainer propperly!"); + "Shared ItemStack between " + ChatColorHelper.DARKGREEN + + "BartWorks" + + ChatColorHelper.GRAY + + " and another Mod, that doesn't use the ModContainer propperly!"); } } } @@ -96,23 +98,24 @@ public class TooltipEventHandler { return; } BioVatLogicAdder.BlockMetaPair PAIR = new BioVatLogicAdder.BlockMetaPair( - BLOCK, - (byte) event.itemStack.getItemDamage()); + BLOCK, + (byte) event.itemStack.getItemDamage()); HashMap<BioVatLogicAdder.BlockMetaPair, Byte> GLASSMAP = BioVatLogicAdder.BioVatGlass.getGlassMap(); if (GLASSMAP.containsKey(PAIR)) { int tier = GLASSMAP.get(PAIR); tooAdd.add( + StatCollector.translateToLocal("tooltip.glas.0.name") + " " + + BW_ColorUtil.getColorForTier(tier) + + GT_Values.VN[tier] + + ChatColorHelper.RESET); + } else if (BLOCK.getMaterial() + .equals(Material.glass)) { + tooAdd.add( StatCollector.translateToLocal("tooltip.glas.0.name") + " " - + BW_ColorUtil.getColorForTier(tier) - + GT_Values.VN[tier] - + ChatColorHelper.RESET); - } else if (BLOCK.getMaterial().equals(Material.glass)) { - tooAdd.add( - StatCollector.translateToLocal("tooltip.glas.0.name") + " " - + BW_ColorUtil.getColorForTier(3) - + GT_Values.VN[3] - + ChatColorHelper.RESET); - } + + BW_ColorUtil.getColorForTier(3) + + GT_Values.VN[3] + + ChatColorHelper.RESET); + } } TooltipCache.put(event.itemStack, tooAdd); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/BioTab.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/BioTab.java index efd085f320..8d3d457e06 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/BioTab.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/BioTab.java @@ -26,6 +26,7 @@ public class BioTab extends CreativeTabs { @Override public Item getTabIconItem() { - return BioItemList.getPetriDish(null).getItem(); + return BioItemList.getPetriDish(null) + .getItem(); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/BW_GUIContainer_RotorBlock.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/BW_GUIContainer_RotorBlock.java index 188c0c9e69..e2bb68b290 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/BW_GUIContainer_RotorBlock.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/gui/BW_GUIContainer_RotorBlock.java @@ -41,39 +41,36 @@ public class BW_GUIContainer_RotorBlock extends GuiWindKineticGenerator { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRendererObj - .drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 6, 2157374); + .drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 6, 2157374); if (this.container.base.checkrotor()) { if (!this.container.base.rotorspace()) { this.fontRendererObj.drawString( - StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotorspace"), - 27, - 52, - 2157374); + StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotorspace"), + 27, + 52, + 2157374); } else if (this.container.base.checkrotor() && !this.container.base.guiisminWindStrength()) { this.fontRendererObj.drawString( - StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"), - 27, - 52, - 2157374); + StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.windweak1"), + 27, + 52, + 2157374); } else { this.fontRendererObj.drawString(this.container.base.getRotorhealth() + " %", 46, 52, 2157374); if (this.container.base.guiisoverload()) { GuiTooltipHelper.drawAreaTooltip( - mouseX - this.guiLeft, - mouseY - this.guiTop, - StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), - 44, - 27, - 79, - 52); + mouseX - this.guiLeft, + mouseY - this.guiTop, + StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), + 44, + 27, + 79, + 52); } } } else { - this.fontRendererObj.drawString( - StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"), - 27, - 52, - 2157374); + this.fontRendererObj + .drawString(StatCollector.translateToLocal("ic2.WindKineticGenerator.gui.rotormiss"), 27, 52, 2157374); } } @@ -81,7 +78,7 @@ public class BW_GUIContainer_RotorBlock extends GuiWindKineticGenerator { protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor3f(0.5f, 0.25f, 0.07f); this.mc.getTextureManager() - .bindTexture(new ResourceLocation(MainMod.MOD_ID, "textures/GUI/GUIPrimitiveKUBox.png")); + .bindTexture(new ResourceLocation(MainMod.MOD_ID, "textures/GUI/GUIPrimitiveKUBox.png")); int j = (this.width - this.xSize) / 2; int k = (this.height - this.ySize) / 2; this.drawTexturedModalRect(j, k, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_EICPistonVisualizer.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_EICPistonVisualizer.java index bb48e4067e..6bf5fd3fe1 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_EICPistonVisualizer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_EICPistonVisualizer.java @@ -32,13 +32,14 @@ public class BW_EICPistonVisualizer extends EntityFX { @Override public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, - float p_70539_5_, float p_70539_6_, float p_70539_7_) { + float p_70539_5_, float p_70539_6_, float p_70539_7_) { Tessellator tessellator = Tessellator.instance; GL11.glDisable(GL11.GL_CULL_FACE); GL11.glDepthMask(false); RenderBlocks.getInstance().blockAccess = this.worldObj; - RenderBlocks.getInstance().setRenderFromInside(false); + RenderBlocks.getInstance() + .setRenderFromInside(false); // Look at nearby block for correct tiered block to use Pair<Block, Integer> tieredBlock; @@ -53,7 +54,8 @@ public class BW_EICPistonVisualizer extends EntityFX { tieredBlock = Pair.of(GregTech_API.sBlockMetal5, 2); } - IIcon icon = tieredBlock.getKey().getIcon(0, tieredBlock.getValue()); + IIcon icon = tieredBlock.getKey() + .getIcon(0, tieredBlock.getValue()); double x = this.posX + 1; double z = this.posZ; @@ -63,7 +65,7 @@ public class BW_EICPistonVisualizer extends EntityFX { double f13 = z - interpPosZ; tessellator.setTranslation(f11 - x, f12 - this.posY, f13 - z); RenderBlocks.getInstance() - .renderBlockUsingTexture(tieredBlock.getKey(), (int) x, (int) this.posY, (int) z, icon); + .renderBlockUsingTexture(tieredBlock.getKey(), (int) x, (int) this.posY, (int) z, icon); x = this.posX - 1; z = this.posZ; @@ -72,7 +74,7 @@ public class BW_EICPistonVisualizer extends EntityFX { f13 = z - interpPosZ; tessellator.setTranslation(f11 - x, f12 - this.posY, f13 - z); RenderBlocks.getInstance() - .renderBlockUsingTexture(tieredBlock.getKey(), (int) x, (int) this.posY, (int) z, icon); + .renderBlockUsingTexture(tieredBlock.getKey(), (int) x, (int) this.posY, (int) z, icon); x = this.posX; z = this.posZ + 1; @@ -81,7 +83,7 @@ public class BW_EICPistonVisualizer extends EntityFX { f13 = z - interpPosZ; tessellator.setTranslation(f11 - x, f12 - this.posY, f13 - z); RenderBlocks.getInstance() - .renderBlockUsingTexture(tieredBlock.getKey(), (int) x, (int) this.posY, (int) z, icon); + .renderBlockUsingTexture(tieredBlock.getKey(), (int) x, (int) this.posY, (int) z, icon); x = this.posX; z = this.posZ - 1; @@ -90,7 +92,7 @@ public class BW_EICPistonVisualizer extends EntityFX { f13 = z - interpPosZ; tessellator.setTranslation(f11 - x, f12 - this.posY, f13 - z); RenderBlocks.getInstance() - .renderBlockUsingTexture(tieredBlock.getKey(), (int) x, (int) this.posY, (int) z, icon); + .renderBlockUsingTexture(tieredBlock.getKey(), (int) x, (int) this.posY, (int) z, icon); tessellator.setTranslation(0d, 0d, 0d); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java index 363de0eda7..4c27a2a3f9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java @@ -47,16 +47,16 @@ public class BW_GT_ItemRenderer implements IItemRenderer { public boolean handleRenderType(ItemStack aStack, IItemRenderer.ItemRenderType aType) { if (!GT_Utility.isStackInvalid(aStack) && aStack.getItemDamage() >= 0) { return aType == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON - || aType == IItemRenderer.ItemRenderType.INVENTORY - || aType == IItemRenderer.ItemRenderType.EQUIPPED - || aType == IItemRenderer.ItemRenderType.ENTITY; + || aType == IItemRenderer.ItemRenderType.INVENTORY + || aType == IItemRenderer.ItemRenderType.EQUIPPED + || aType == IItemRenderer.ItemRenderType.ENTITY; } return false; } @Override public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType aType, ItemStack aStack, - IItemRenderer.ItemRendererHelper aHelper) { + IItemRenderer.ItemRendererHelper aHelper) { if (GT_Utility.isStackInvalid(aStack)) { return false; } @@ -89,26 +89,26 @@ public class BW_GT_ItemRenderer implements IItemRenderer { else { for (int i = 0; i < 4; i++) { GT_RenderUtil.renderItemIcon( - tIcon, - 0.0D + i * 2D, - 0.0D + i * 2D, - 10.0D + i * 2D, - 10.0D + i * 2D, - 0.001D, - 0.0F, - 0.0F, - -1.0F); + tIcon, + 0.0D + i * 2D, + 0.0D + i * 2D, + 10.0D + i * 2D, + 10.0D + i * 2D, + 0.001D, + 0.0F, + 0.0F, + -1.0F); } } } else if (aMetaData < CircuitImprintLoader.reverseIDs) ItemRenderer.renderItemIn2D( - Tessellator.instance, - tIcon.getMaxU(), - tIcon.getMinV(), - tIcon.getMinU(), - tIcon.getMaxV(), - tIcon.getIconWidth(), - tIcon.getIconHeight(), - 0.0625F); + Tessellator.instance, + tIcon.getMaxU(), + tIcon.getMinV(), + tIcon.getMinU(), + tIcon.getMaxV(), + tIcon.getIconWidth(), + tIcon.getIconHeight(), + 0.0625F); IIcon tOverlay = (IIcon) BW_Util.get2DCoordFrom1DArray(aMetaData, 1, 2, aItem.mIconList); GL11.glColor3f(1.0F, 1.0F, 1.0F); @@ -119,14 +119,14 @@ public class BW_GT_ItemRenderer implements IItemRenderer { GT_RenderUtil.renderItemIcon(tOverlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { ItemRenderer.renderItemIn2D( - Tessellator.instance, - tOverlay.getMaxU(), - tOverlay.getMinV(), - tOverlay.getMinU(), - tOverlay.getMaxV(), - tOverlay.getIconWidth(), - tOverlay.getIconHeight(), - 0.0625F); + Tessellator.instance, + tOverlay.getMaxU(), + tOverlay.getMinV(), + tOverlay.getMinU(), + tOverlay.getMaxV(), + tOverlay.getIconWidth(), + tOverlay.getIconHeight(), + 0.0625F); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java index 99733ef212..7bb04e0c39 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java @@ -61,59 +61,59 @@ public class BW_Renderer_Block_Ores implements ISimpleBlockRenderingHandler { GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); renderNegativeYFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tTileEntity.getTexture(aBlock, ForgeDirection.DOWN), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tTileEntity.getTexture(aBlock, ForgeDirection.DOWN), + true); renderPositiveYFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tTileEntity.getTexture(aBlock, ForgeDirection.UP), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tTileEntity.getTexture(aBlock, ForgeDirection.UP), + true); renderNegativeZFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tTileEntity.getTexture(aBlock, ForgeDirection.NORTH), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tTileEntity.getTexture(aBlock, ForgeDirection.NORTH), + true); renderPositiveZFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tTileEntity.getTexture(aBlock, ForgeDirection.SOUTH), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tTileEntity.getTexture(aBlock, ForgeDirection.SOUTH), + true); renderNegativeXFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tTileEntity.getTexture(aBlock, ForgeDirection.WEST), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tTileEntity.getTexture(aBlock, ForgeDirection.WEST), + true); renderPositiveXFacing( - null, - aRenderer, - aBlock, - 0, - 0, - 0, - tTileEntity.getTexture(aBlock, ForgeDirection.EAST), - true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tTileEntity.getTexture(aBlock, ForgeDirection.EAST), + true); aRenderer.setRenderBoundsFromBlock(aBlock); aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax); GL11.glTranslatef(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererSwitchingColorFluid.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererSwitchingColorFluid.java index 6af2f2df7d..7a12074e02 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererSwitchingColorFluid.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererSwitchingColorFluid.java @@ -57,7 +57,7 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler float end = 0.0f; for (float aFlow : flow) { if (aFlow >= RendererSwitchingColorFluid.THREE_QUARTERS_FILLED - && end != RendererSwitchingColorFluid.LIGHT_Y_POS) { + && end != RendererSwitchingColorFluid.LIGHT_Y_POS) { end = aFlow; } if (aFlow >= 0.0f) { @@ -75,15 +75,17 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler if (world.getBlock(x, y, z) == block) { Block vOrigin = world.getBlock(x, y + 1, z); - if (vOrigin.getMaterial().isLiquid() || vOrigin instanceof IFluidBlock) { + if (vOrigin.getMaterial() + .isLiquid() || vOrigin instanceof IFluidBlock) { return RendererSwitchingColorFluid.LIGHT_Y_POS; } if (world.getBlockMetadata(x, y, z) == block.getMaxRenderHeightMeta()) { return RendererSwitchingColorFluid.THREE_QUARTERS_FILLED; } } - return !world.getBlock(x, y, z).getMaterial().isSolid() && world.getBlock(x, y + 1, z) == block - ? RendererSwitchingColorFluid.LIGHT_Y_POS + return !world.getBlock(x, y, z) + .getMaterial() + .isSolid() && world.getBlock(x, y + 1, z) == block ? RendererSwitchingColorFluid.LIGHT_Y_POS : block.getQuantaPercentage(world, x, y, z) * RendererSwitchingColorFluid.THREE_QUARTERS_FILLED; } @@ -91,10 +93,15 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler @SideOnly(Side.CLIENT) public boolean renderWorldBlock(IBlockAccess iBlockAccess, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { if (!(block instanceof BioFluidBlock)) return false; Tessellator tessellator = Tessellator.instance; - Coords blockat = new Coords(x, y, z, iBlockAccess.getTileEntity(x, y, z).getWorldObj().provider.dimensionId); + Coords blockat = new Coords( + x, + y, + z, + iBlockAccess.getTileEntity(x, y, z) + .getWorldObj().provider.dimensionId); Integer rgb = GT_TileEntity_BioVat.staticColorMap.get(blockat); int r, g, b; @@ -113,11 +120,11 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler BlockFluidBase blockFluidBase = (BlockFluidBase) block; boolean renderTop = iBlockAccess.getBlock(x, y + 1, z) != blockFluidBase; boolean renderBottom = block.shouldSideBeRendered(iBlockAccess, x, y - 1, z, 0) - && iBlockAccess.getBlock(x, y - 1, z) != blockFluidBase; + && iBlockAccess.getBlock(x, y - 1, z) != blockFluidBase; boolean[] renderSides = { block.shouldSideBeRendered(iBlockAccess, x, y, z - 1, 2), - block.shouldSideBeRendered(iBlockAccess, x, y, z + 1, 3), - block.shouldSideBeRendered(iBlockAccess, x - 1, y, z, 4), - block.shouldSideBeRendered(iBlockAccess, x + 1, y, z, 5) }; + block.shouldSideBeRendered(iBlockAccess, x, y, z + 1, 3), + block.shouldSideBeRendered(iBlockAccess, x - 1, y, z, 4), + block.shouldSideBeRendered(iBlockAccess, x + 1, y, z, 5) }; if (!renderTop && !renderBottom && !renderSides[0] && !renderSides[1] && !renderSides[2] && !renderSides[3]) { return false; } @@ -135,17 +142,17 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler float fluidHeightForRender7 = this.getFluidHeightForRender(iBlockAccess, x + 1, y, z, blockFluidBase); float fluidHeightForRender8 = this.getFluidHeightForRender(iBlockAccess, x + 1, y, z + 1, blockFluidBase); heightNW = this.getFluidHeightAverage( - new float[] { fluidHeightForRender1, fluidHeightForRender2, fluidHeightForRender4, - fluidHeightForRender }); + new float[] { fluidHeightForRender1, fluidHeightForRender2, fluidHeightForRender4, + fluidHeightForRender }); heightSW = this.getFluidHeightAverage( - new float[] { fluidHeightForRender2, fluidHeightForRender3, fluidHeightForRender5, - fluidHeightForRender }); + new float[] { fluidHeightForRender2, fluidHeightForRender3, fluidHeightForRender5, + fluidHeightForRender }); heightSE = this.getFluidHeightAverage( - new float[] { fluidHeightForRender5, fluidHeightForRender7, fluidHeightForRender8, - fluidHeightForRender }); + new float[] { fluidHeightForRender5, fluidHeightForRender7, fluidHeightForRender8, + fluidHeightForRender }); heightNE = this.getFluidHeightAverage( - new float[] { fluidHeightForRender4, fluidHeightForRender6, fluidHeightForRender7, - fluidHeightForRender }); + new float[] { fluidHeightForRender4, fluidHeightForRender6, fluidHeightForRender7, + fluidHeightForRender }); } else { heightNW = fluidHeightForRender; heightSW = fluidHeightForRender; @@ -164,7 +171,7 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler heightNE -= RendererSwitchingColorFluid.RENDER_OFFSET; double dInterpolatedU, dInterpolatedV, dInterpolatedU2, dInterpolatedV2, dInterpolatedU3, dInterpolatedV3, - dInterpolatedU4, dInterpolatedV4; + dInterpolatedU4, dInterpolatedV4; if (flowDir < -999.0f) { dInterpolatedU = iconStill.getInterpolatedU(0.0); @@ -189,9 +196,9 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler tessellator.setBrightness(block.getMixedBrightnessForBlock(iBlockAccess, x, y, z)); tessellator.setColorOpaque_F( - RendererSwitchingColorFluid.LIGHT_Y_POS * red, - RendererSwitchingColorFluid.LIGHT_Y_POS * green, - RendererSwitchingColorFluid.LIGHT_Y_POS * blue); + RendererSwitchingColorFluid.LIGHT_Y_POS * red, + RendererSwitchingColorFluid.LIGHT_Y_POS * green, + RendererSwitchingColorFluid.LIGHT_Y_POS * blue); tessellator.addVertexWithUV(x, y + heightNW, z, dInterpolatedU, dInterpolatedV); tessellator.addVertexWithUV(x, y + heightSW, z + 1, dInterpolatedU2, dInterpolatedV2); @@ -207,15 +214,15 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler rendered = true; tessellator.setBrightness(block.getMixedBrightnessForBlock(iBlockAccess, x, y - 1, z)); tessellator.setColorOpaque_F( - RendererSwitchingColorFluid.LIGHT_Y_NEG * red, - RendererSwitchingColorFluid.LIGHT_Y_NEG * green, - RendererSwitchingColorFluid.LIGHT_Y_NEG * blue); + RendererSwitchingColorFluid.LIGHT_Y_NEG * red, + RendererSwitchingColorFluid.LIGHT_Y_NEG * green, + RendererSwitchingColorFluid.LIGHT_Y_NEG * blue); renderer.renderFaceYNeg( - block, - x, - y + RendererSwitchingColorFluid.RENDER_OFFSET, - z, - this.getNullCheckedIiconOrFallbackTexture()); + block, + x, + y + RendererSwitchingColorFluid.RENDER_OFFSET, + z, + this.getNullCheckedIiconOrFallbackTexture()); } for (int side = 0; side < 4; ++side) { @@ -290,9 +297,9 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler sideLighting = RendererSwitchingColorFluid.LIGHT_XZ_POS; } tessellator.setColorOpaque_F( - RendererSwitchingColorFluid.LIGHT_Y_POS * sideLighting * red, - RendererSwitchingColorFluid.LIGHT_Y_POS * sideLighting * green, - RendererSwitchingColorFluid.LIGHT_Y_POS * sideLighting * blue); + RendererSwitchingColorFluid.LIGHT_Y_POS * sideLighting * red, + RendererSwitchingColorFluid.LIGHT_Y_POS * sideLighting * green, + RendererSwitchingColorFluid.LIGHT_Y_POS * sideLighting * blue); tessellator.addVertexWithUV(dXcoord1, y + dHeight1, dZcoord1, u1Flow, v1Flow); tessellator.addVertexWithUV(dXcoord2, y + dHeight2, dZcoord2, u2Flow, v2Flow); @@ -319,7 +326,8 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler private IIcon getNullCheckedIiconOrFallbackTexture() { return FluidLoader.autogenIIcon != null ? FluidLoader.autogenIIcon - : ((TextureMap) Minecraft.getMinecraft().getTextureManager() - .getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno"); + : ((TextureMap) Minecraft.getMinecraft() + .getTextureManager() + .getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno"); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/textures/PrefixTextureLinker.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/textures/PrefixTextureLinker.java index 2e025b27e4..09df8f98f8 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/client/textures/PrefixTextureLinker.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/textures/PrefixTextureLinker.java @@ -36,43 +36,52 @@ public class PrefixTextureLinker implements Runnable { private static void fillBlockTexMap() { blockTexMap.put(TextureSet.SET_QUARTZ, TextureSet.INDEX_block4); - Stream.of(OrePrefixes.blockCasing, OrePrefixes.blockCasingAdvanced).forEach(prefixes -> { - HashMap<TextureSet, IIconContainer> curr = new HashMap<>(); - Arrays.stream(TextureSet.class.getFields()).filter(field -> field.getName().contains("SET")) + Stream.of(OrePrefixes.blockCasing, OrePrefixes.blockCasingAdvanced) + .forEach(prefixes -> { + HashMap<TextureSet, IIconContainer> curr = new HashMap<>(); + Arrays.stream(TextureSet.class.getFields()) + .filter( + field -> field.getName() + .contains("SET")) .forEach(SET -> { try { curr.put( - (TextureSet) SET.get(null), - new Textures.BlockIcons.CustomIcon( - "materialicons/" + SET.getName().substring(4) + "/" + prefixes)); + (TextureSet) SET.get(null), + new Textures.BlockIcons.CustomIcon( + "materialicons/" + SET.getName() + .substring(4) + "/" + prefixes)); } catch (IllegalAccessException e) { e.printStackTrace(); } }); - texMapBlocks.put(prefixes, curr); - }); + texMapBlocks.put(prefixes, curr); + }); } private static void fillItemTexMap() { Arrays.stream(OrePrefixes.values()) - .filter( - prefixes -> prefixes != OrePrefixes.rod && prefixes.mTextureIndex == -1 - && Werkstoff.GenerationFeatures.getPrefixDataRaw(prefixes) != 0) - .forEach(prefixes -> { - HashMap<TextureSet, Textures.ItemIcons.CustomIcon> curr = new HashMap<>(); - Arrays.stream(TextureSet.class.getFields()).filter(field -> field.getName().contains("SET")) - .forEach(SET -> { - try { - curr.put( - (TextureSet) SET.get(null), - new Textures.ItemIcons.CustomIcon( - "materialicons/" + SET.getName().substring(4) + "/" + prefixes)); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - }); - texMap.put(prefixes, curr); - }); + .filter( + prefixes -> prefixes != OrePrefixes.rod && prefixes.mTextureIndex == -1 + && Werkstoff.GenerationFeatures.getPrefixDataRaw(prefixes) != 0) + .forEach(prefixes -> { + HashMap<TextureSet, Textures.ItemIcons.CustomIcon> curr = new HashMap<>(); + Arrays.stream(TextureSet.class.getFields()) + .filter( + field -> field.getName() + .contains("SET")) + .forEach(SET -> { + try { + curr.put( + (TextureSet) SET.get(null), + new Textures.ItemIcons.CustomIcon( + "materialicons/" + SET.getName() + .substring(4) + "/" + prefixes)); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + }); + texMap.put(prefixes, curr); + }); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java index 5c596a0b5e..c60f63129a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java @@ -41,7 +41,7 @@ public class BW_GlasBlocks extends BW_Blocks { } public BW_GlasBlocks(String name, String[] texture, short[][] color, CreativeTabs tabs, boolean connectedTex, - boolean fake) { + boolean fake) { super(name, texture, tabs, Material.glass); this.connectedTex = connectedTex; this.color = color; @@ -87,7 +87,7 @@ public class BW_GlasBlocks extends BW_Blocks { String[] splitname = this.textureNames[0].split(":"); for (int j = 0; j < 16; j++) { this.connectedTexture[j] = par1IconRegister - .registerIcon(splitname[0] + ":connectedTex/" + splitname[1] + '/' + splitname[1] + '_' + j); + .registerIcon(splitname[0] + ":connectedTex/" + splitname[1] + '/' + splitname[1] + '_' + j); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks2.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks2.java index 24033787c4..4ef12dc30b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks2.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks2.java @@ -28,7 +28,7 @@ public class BW_GlasBlocks2 extends BW_Blocks { } public BW_GlasBlocks2(String name, String[] texture, short[][] color, CreativeTabs tabs, boolean connectedTex, - boolean fake) { + boolean fake) { super(name, texture, tabs, Material.glass); this.connectedTex = connectedTex; this.color = color; @@ -74,12 +74,12 @@ public class BW_GlasBlocks2 extends BW_Blocks { String[] splitname = this.textureNames[0].split(":"); for (int j = 0; j < 16; j++) { this.connectedTexture[j] = par1IconRegister.registerIcon( - splitname[0] + ":connectedTex/" - + "BoronSilicateGlassBlock" - + '/' - + "BoronSilicateGlassBlock" - + '_' - + j); + splitname[0] + ":connectedTex/" + + "BoronSilicateGlassBlock" + + '/' + + "BoronSilicateGlassBlock" + + '_' + + j); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java index 07db82fcb2..fb8e163ad1 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java @@ -61,25 +61,28 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI @Override public boolean onBlockActivated(World worldObj, int x, int y, int z, EntityPlayer player, int side, float subX, - float subY, float subZ) { + float subY, float subZ) { if (worldObj.isRemote) { return false; } TileEntity tile = worldObj.getTileEntity(x, y, z); if (tile instanceof BW_TileEntity_HeatedWaterPump) { - if (player.getHeldItem() != null - && (player.getHeldItem().getItem().equals(Items.bucket) - || player.getHeldItem().getItem() instanceof IFluidContainerItem) - && ((BW_TileEntity_HeatedWaterPump) tile).drain(1000, false) != null) - if (player.getHeldItem().getItem().equals(Items.bucket) - && ((BW_TileEntity_HeatedWaterPump) tile).drain(1000, false).amount == 1000) { - ((BW_TileEntity_HeatedWaterPump) tile).drain(1000, true); - player.getHeldItem().stackSize--; - if (player.getHeldItem().stackSize <= 0) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); - player.inventory.addItemStackToInventory(new ItemStack(Items.water_bucket)); - return true; - } + if (player.getHeldItem() != null && (player.getHeldItem() + .getItem() + .equals(Items.bucket) + || player.getHeldItem() + .getItem() instanceof IFluidContainerItem) + && ((BW_TileEntity_HeatedWaterPump) tile).drain(1000, false) != null) + if (player.getHeldItem() + .getItem() + .equals(Items.bucket) && ((BW_TileEntity_HeatedWaterPump) tile).drain(1000, false).amount == 1000) { + ((BW_TileEntity_HeatedWaterPump) tile).drain(1000, true); + player.getHeldItem().stackSize--; + if (player.getHeldItem().stackSize <= 0) + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + player.inventory.addItemStackToInventory(new ItemStack(Items.water_bucket)); + return true; + } } if (!player.isSneaking()) { if (tile instanceof IHasGui) { @@ -128,7 +131,7 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI int[] dropSlots = ((ITileDropsContent) t).getDropSlots(); for (int dropSlot : dropSlots) { if (((ITileDropsContent) t).getStackInSlot(dropSlot) != null) world.spawnEntityInWorld( - new EntityItem(world, x, y, z, ((BW_TileEntity_HeatedWaterPump) t).getStackInSlot(dropSlot))); + new EntityItem(world, x, y, z, ((BW_TileEntity_HeatedWaterPump) t).getStackInSlot(dropSlot))); } } super.breakBlock(world, x, y, z, block, meta); @@ -139,8 +142,8 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI public IIcon getIcon(int side, int meta) { if (!ITileHasDifferentTextureSides.class.isAssignableFrom(this.tileEntity)) return super.getIcon(side, meta); try { - return ((ITileHasDifferentTextureSides) this.tileEntity.getConstructor().newInstance()) - .getTextureForSide(side, meta); + return ((ITileHasDifferentTextureSides) this.tileEntity.getConstructor() + .newInstance()).getTextureForSide(side, meta); } catch (Exception e) { e.printStackTrace(); return super.getIcon(side, meta); @@ -152,8 +155,8 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI public void registerBlockIcons(IIconRegister par1IconRegister) { if (ITileHasDifferentTextureSides.class.isAssignableFrom(this.tileEntity)) { try { - ((ITileHasDifferentTextureSides) this.tileEntity.getConstructor().newInstance()) - .registerBlockIcons(par1IconRegister); + ((ITileHasDifferentTextureSides) this.tileEntity.getConstructor() + .newInstance()).registerBlockIcons(par1IconRegister); } catch (Exception e) { e.printStackTrace(); } @@ -163,7 +166,8 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI @Override public TileEntity createNewTileEntity(World worldIn, int meta) { try { - return this.tileEntity.getConstructor().newInstance(); + return this.tileEntity.getConstructor() + .newInstance(); } catch (Exception e) { e.printStackTrace(); } @@ -189,7 +193,8 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI public String[] getInfoData() { if (ITileAddsInformation.class.isAssignableFrom(this.tileEntity)) { try { - return ((ITileAddsInformation) this.tileEntity.getConstructor().newInstance()).getInfoData(); + return ((ITileAddsInformation) this.tileEntity.getConstructor() + .newInstance()).getInfoData(); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java index 89d7dfae75..0d1d9fd20b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java @@ -23,7 +23,7 @@ import gregtech.api.GregTech_API; public class BW_TileEntityContainer_MachineBlock extends BW_TileEntityContainer { public BW_TileEntityContainer_MachineBlock(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, - String blockName) { + String blockName) { super(p_i45386_1_, tileEntity, blockName); GregTech_API.registerMachineBlock(this, -1); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_Multiple.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_Multiple.java index a7b39dcee3..852d8370ad 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_Multiple.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_Multiple.java @@ -51,7 +51,7 @@ public class BW_TileEntityContainer_Multiple extends BlockContainer { protected IIcon[] texture; public BW_TileEntityContainer_Multiple(Material p_i45386_1_, Class<? extends TileEntity>[] tileEntity, - String blockName, String[] textureNames, CreativeTabs tabs) { + String blockName, String[] textureNames, CreativeTabs tabs) { super(p_i45386_1_); this.setHardness(15.0F); this.setResistance(30.0F); @@ -65,7 +65,7 @@ public class BW_TileEntityContainer_Multiple extends BlockContainer { @Override public boolean onBlockActivated(World worldObj, int x, int y, int z, EntityPlayer player, int side, float subX, - float subY, float subZ) { + float subY, float subZ) { if (worldObj.isRemote) { return true; } @@ -154,7 +154,8 @@ public class BW_TileEntityContainer_Multiple extends BlockContainer { @Override public TileEntity createNewTileEntity(World worldIn, int meta) { try { - return this.tileEntityArray[meta].getConstructor().newInstance(); + return this.tileEntityArray[meta].getConstructor() + .newInstance(); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/PrintRecipeListToFile.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/PrintRecipeListToFile.java index 28d840ac55..dcd7caee97 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/PrintRecipeListToFile.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/PrintRecipeListToFile.java @@ -40,13 +40,19 @@ public class PrintRecipeListToFile extends CommandBase { try { BufferedWriter fw = new BufferedWriter(new FileWriter(file)); - CraftingManager.getInstance().getRecipeList().forEach(e -> { - try { - fw.write(e.toString() + " = " + e.getRecipeOutput().getDisplayName() + "\n"); - } catch (IOException ex) { - ex.printStackTrace(); - } - }); + CraftingManager.getInstance() + .getRecipeList() + .forEach(e -> { + try { + fw.write( + e.toString() + " = " + + e.getRecipeOutput() + .getDisplayName() + + "\n"); + } catch (IOException ex) { + ex.printStackTrace(); + } + }); fw.flush(); fw.close(); } catch (IOException e) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/RunGC.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/RunGC.java index 4bbb719501..5b76d6a163 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/RunGC.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/RunGC.java @@ -31,7 +31,8 @@ public class RunGC extends CommandBase { @Override public void processCommand(ICommandSender sender, String[] args) { - Runtime.getRuntime().gc(); + Runtime.getRuntime() + .gc(); sender.addChatMessage(new ChatComponentText("Ran GC!")); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/SummonRuin.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/SummonRuin.java index 2def53c24e..5b37a98e7e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/SummonRuin.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/SummonRuin.java @@ -34,11 +34,11 @@ public class SummonRuin extends CommandBase { public void processCommand(ICommandSender iCommandSender, String[] args) { try { new MapGenRuins.RuinsBase().generate( - iCommandSender.getEntityWorld(), - iCommandSender.getEntityWorld().rand, - Integer.parseInt(args[0]), - 256, - Integer.parseInt(args[1])); + iCommandSender.getEntityWorld(), + iCommandSender.getEntityWorld().rand, + Integer.parseInt(args[0]), + 256, + Integer.parseInt(args[1])); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java index 4644775cdb..7c5a515b86 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java @@ -72,226 +72,248 @@ public class ConfigHandler { public static boolean disablePistonInEIC = false; private static final int[][] METAFORTIERS_ENERGY = { { 100, 101, 102, 105 }, { 1110, 1115, 1120, 1127 }, - { 1111, 12726, 1116, 1121, 1128 }, { 1112, 12727, 1117, 1122, 1129 }, { 12728, 1190, 1130, 12685 }, - { 1191, 1174, 695, 12686 }, }; + { 1111, 12726, 1116, 1121, 1128 }, { 1112, 12727, 1117, 1122, 1129 }, { 12728, 1190, 1130, 12685 }, + { 1191, 1174, 695, 12686 }, }; private static final int[][] METAFORTIERS_BUFFER = { { 5133, 5123 }, { 161, 171, 181, 191 }, { 162, 172, 182, 192 }, - { 163, 173, 183, 193 }, { 164, 174, 184, 194 }, { 165, 175, 185, 195 }, }; + { 163, 173, 183, 193 }, { 164, 174, 184, 194 }, { 165, 175, 185, 195 }, }; private static final int[][] METAFORTIERS_CABLE = { { 5133, 5123 }, { 1210, 1230, 1250, 1270, 1290 }, - { 1310, 1330, 1350, 1370, 1390 }, { 1410, 1430, 1450, 1470, 1490 }, { 1510, 1530, 1550, 1570, 1590 }, - { 1650, 1670, 1690 }, }; + { 1310, 1330, 1350, 1370, 1390 }, { 1410, 1430, 1450, 1470, 1490 }, { 1510, 1530, 1550, 1570, 1590 }, + { 1650, 1670, 1690 }, }; private static final int[][] METAFORTIERS_MACHINE = { - { 103, 104, 106, 107, 109, 110, 112, 113, 115, 116, 118, 119 }, - { 201, 211, 221, 231, 241, 251, 261, 271, 281, 291, 301, 311, 321, 331, 341, 351, 361, 371, 381, 391, 401, - 411, 421, 431, 441, 451, 461, 471, 481, 491, 501, 511, 521, 531, 541, 551, 561, 571, 581, 591, 601, - 611, 621, 631, 641, 651, 661, 671 }, - { 202, 212, 222, 232, 242, 252, 262, 272, 282, 292, 302, 312, 322, 332, 342, 352, 362, 372, 382, 392, 402, - 412, 422, 432, 442, 452, 462, 472, 482, 492, 502, 512, 522, 532, 542, 552, 562, 572, 582, 592, 602, - 612, 622, 632, 642, 652, 662, 672 }, - { 203, 213, 223, 233, 243, 253, 263, 273, 283, 293, 303, 313, 323, 333, 343, 353, 363, 373, 383, 393, 403, - 413, 423, 433, 443, 453, 463, 473, 483, 493, 503, 513, 523, 533, 543, 553, 563, 573, 583, 593, 603, - 613, 623, 633, 643, 653, 663, 673 }, - { 204, 214, 224, 234, 244, 254, 264, 274, 284, 294, 304, 314, 324, 334, 344, 354, 364, 374, 384, 394, 404, - 414, 424, 434, 444, 454, 464, 474, 484, 494, 504, 514, 524, 534, 544, 554, 564, 574, 584, 594, 604, - 614, 624, 634, 644, 654, 664, 674 }, - { 205, 215, 225, 235, 245, 255, 265, 275, 285, 295, 305, 315, 325, 335, 345, 355, 365, 375, 385, 395, 405, - 415, 425, 435, 445, 455, 465, 475, 485, 495, 505, 515, 525, 535, 545, 555, 565, 575, 585, 595, 605, - 615, 625, 635, 645, 655, 665, 675 }, }; + { 103, 104, 106, 107, 109, 110, 112, 113, 115, 116, 118, 119 }, + { 201, 211, 221, 231, 241, 251, 261, 271, 281, 291, 301, 311, 321, 331, 341, 351, 361, 371, 381, 391, 401, 411, + 421, 431, 441, 451, 461, 471, 481, 491, 501, 511, 521, 531, 541, 551, 561, 571, 581, 591, 601, 611, 621, + 631, 641, 651, 661, 671 }, + { 202, 212, 222, 232, 242, 252, 262, 272, 282, 292, 302, 312, 322, 332, 342, 352, 362, 372, 382, 392, 402, 412, + 422, 432, 442, 452, 462, 472, 482, 492, 502, 512, 522, 532, 542, 552, 562, 572, 582, 592, 602, 612, 622, + 632, 642, 652, 662, 672 }, + { 203, 213, 223, 233, 243, 253, 263, 273, 283, 293, 303, 313, 323, 333, 343, 353, 363, 373, 383, 393, 403, 413, + 423, 433, 443, 453, 463, 473, 483, 493, 503, 513, 523, 533, 543, 553, 563, 573, 583, 593, 603, 613, 623, + 633, 643, 653, 663, 673 }, + { 204, 214, 224, 234, 244, 254, 264, 274, 284, 294, 304, 314, 324, 334, 344, 354, 364, 374, 384, 394, 404, 414, + 424, 434, 444, 454, 464, 474, 484, 494, 504, 514, 524, 534, 544, 554, 564, 574, 584, 594, 604, 614, 624, + 634, 644, 654, 664, 674 }, + { 205, 215, 225, 235, 245, 255, 265, 275, 285, 295, 305, 315, 325, 335, 345, 355, 365, 375, 385, 395, 405, 415, + 425, 435, 445, 455, 465, 475, 485, 495, 505, 515, 525, 535, 545, 555, 565, 575, 585, 595, 605, 615, 625, + 635, 645, 655, 665, 675 }, }; private static int[][][] defaultMetasForTiers = { METAFORTIERS_ENERGY, METAFORTIERS_BUFFER, METAFORTIERS_CABLE, - METAFORTIERS_MACHINE }; + METAFORTIERS_MACHINE }; private static final String[] VOLTAGE_NAMES = { "High Pressure Steam", "Low Voltage", "Medium Voltage", - "High Voltage", "Extreme Voltage", "Insane Voltage", "Ludicrous Voltage", "ZPM Voltage", "Ultimate Voltage", - "Ultimate High Voltage", "Ultimate Extreme Voltage", "Ultimate Insane Voltage", "Ultimate Mega Voltage", - "Ultimate Extended Mega Voltage", "Overpowered Voltage", "Maximum Voltage" }; + "High Voltage", "Extreme Voltage", "Insane Voltage", "Ludicrous Voltage", "ZPM Voltage", "Ultimate Voltage", + "Ultimate High Voltage", "Ultimate Extreme Voltage", "Ultimate Insane Voltage", "Ultimate Mega Voltage", + "Ultimate Extended Mega Voltage", "Overpowered Voltage", "Maximum Voltage" }; private static final String[] names = { "Generators", "Buffers", "Cables", "Machines" }; public ConfigHandler(Configuration C) { ConfigHandler.c = C; - ConfigHandler.classicMode = ConfigHandler.c.get( + ConfigHandler.classicMode = ConfigHandler.c + .get( "System", "Enable Classic Mode", false, - "Enables the classic Mode (all recipes in normal machines are doable in MV").getBoolean(false); + "Enables the classic Mode (all recipes in normal machines are doable in MV") + .getBoolean(false); ConfigHandler.creativeScannerID = ConfigHandler.c - .get("System", "Creative Debug Scanner", 0, "ID for the Creative Debug Scanner Block").getInt(0); + .get("System", "Creative Debug Scanner", 0, "ID for the Creative Debug Scanner Block") + .getInt(0); ConfigHandler.tooltips = ConfigHandler.c - .get("System", "BartWorksToolTips", true, "If you wish to enable extra tooltips").getBoolean(true); - ConfigHandler.sharedItemStackTooltip = ConfigHandler.c.get( + .get("System", "BartWorksToolTips", true, "If you wish to enable extra tooltips") + .getBoolean(true); + ConfigHandler.sharedItemStackTooltip = ConfigHandler.c + .get( "System", "BartWorksSharedItemStackToolTips", true, - "If you wish to enable \"Shared Item Stack\" tooltips").getBoolean(true); + "If you wish to enable \"Shared Item Stack\" tooltips") + .getBoolean(true); - ConfigHandler.IDOffset = ConfigHandler.c.get( + ConfigHandler.IDOffset = ConfigHandler.c + .get( "System", "ID Offset", 12600, "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU - + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") - .getInt(12600); - ConfigHandler.teslastaff = ConfigHandler.c.get( + + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") + .getInt(12600); + ConfigHandler.teslastaff = ConfigHandler.c + .get( "System", "Enable Teslastaff", false, - "Enables the Teslastaff, an Item used to destroy Electric Armors").getBoolean(false); + "Enables the Teslastaff, an Item used to destroy Electric Armors") + .getBoolean(false); ConfigHandler.BioLab = !ConfigHandler.c.get( - "System", - "Disable BioLab", - false, - "This switch disables the BioLab, BioVat etc. If you use GT5.08 or equivalent, this needs to be turned off!") - .getBoolean(false); - ConfigHandler.cutoffTier = ConfigHandler.c.get( + "System", + "Disable BioLab", + false, + "This switch disables the BioLab, BioVat etc. If you use GT5.08 or equivalent, this needs to be turned off!") + .getBoolean(false); + ConfigHandler.cutoffTier = ConfigHandler.c + .get( "System", "Tier to nerf circuits", 5, "This switch sets the lowest unnerfed Circuit Recipe Tier. -1 to disable it completely.", -1, - VOLTAGE_NAMES.length).getInt(5); + VOLTAGE_NAMES.length) + .getInt(5); ConfigHandler.cutoffTier = ConfigHandler.cutoffTier == -1 ? VOLTAGE_NAMES.length : ConfigHandler.cutoffTier; ConfigHandler.disableExtraGassesForEBF = ConfigHandler.c - .get( - "System", - "Disable Extra Gases for EBF", - false, - "This switch disables extra gas recipes for the EBF, i.e. Xenon instead of Nitrogen") - .getBoolean(false); - ConfigHandler.disableBoltedBlocksCasing = ConfigHandler.c - .get("System", "Disable Bolted Casings", false, "This switch disable the generation of bolted casings") - .getBoolean(false); - ConfigHandler.disableReboltedBlocksCasing = ConfigHandler.c.get( + .get( "System", - "Disable Rebolted Casings", + "Disable Extra Gases for EBF", false, - "This switch disable the generation of rebolted casings").getBoolean(false); + "This switch disables extra gas recipes for the EBF, i.e. Xenon instead of Nitrogen") + .getBoolean(false); + ConfigHandler.disableBoltedBlocksCasing = ConfigHandler.c + .get("System", "Disable Bolted Casings", false, "This switch disable the generation of bolted casings") + .getBoolean(false); + ConfigHandler.disableReboltedBlocksCasing = ConfigHandler.c + .get("System", "Disable Rebolted Casings", false, "This switch disable the generation of rebolted casings") + .getBoolean(false); ConfigHandler.mbWaterperSec = ConfigHandler.c.get("Singleblocks", "mL Water per Sec for the StirlingPump", 150) - .getInt(150); + .getInt(150); - ConfigHandler.energyPerCell = ConfigHandler.c.get( + ConfigHandler.energyPerCell = ConfigHandler.c + .get( "Multiblocks", "energyPerLESUCell", 1000000, "This will set Up the Energy per LESU Cell", 1000000, - Integer.MAX_VALUE).getInt(1000000); + Integer.MAX_VALUE) + .getInt(1000000); ConfigHandler.DEHPDirectSteam = ConfigHandler.c.get( - "Multiblocks", - "DEHP Direct Steam Mode", - false, - "This switch enables the Direct Steam Mode of the DEHP. If enabled it will take in Waterand output steam. If disabled it will Input IC2Coolant and output hot coolant") - .getBoolean(false); - ConfigHandler.megaMachinesMax = ConfigHandler.c.get( + "Multiblocks", + "DEHP Direct Steam Mode", + false, + "This switch enables the Direct Steam Mode of the DEHP. If enabled it will take in Waterand output steam. If disabled it will Input IC2Coolant and output hot coolant") + .getBoolean(false); + ConfigHandler.megaMachinesMax = ConfigHandler.c + .get( "Multiblocks", "Mega Machines Maximum Recipes per Operation", 256, - "This changes the Maximum Recipes per Operation to the specified Valure").getInt(256); + "This changes the Maximum Recipes per Operation to the specified Valure") + .getInt(256); ConfigHandler.bioVatMaxParallelBonus = ConfigHandler.c - .get( - "Multiblocks", - "BioVat Maximum Bonus on Recipes", - 1000, - "This are the maximum parallel Operations the BioVat can do, when the output is half full.") - .getInt(1000); + .get( + "Multiblocks", + "BioVat Maximum Bonus on Recipes", + 1000, + "This are the maximum parallel Operations the BioVat can do, when the output is half full.") + .getInt(1000); ConfigHandler.voidMinerBlacklist = Collections.unmodifiableSet( - new HashSet<>( - Arrays.asList( - ConfigHandler.c.get( - "Multiblocks", - "Void Miner Blacklist", - new String[0], - "This is a blacklist for the Void Miner, blacklisted ores will not enter the drop prize pool. Please fill in the Unique Identifier of Ore and connect Damage with a colon, For example: gregtech:gt.blockores:32") - .getStringList()))); - ConfigHandler.disablePistonInEIC = ConfigHandler.c - .get( + new HashSet<>( + Arrays.asList( + ConfigHandler.c.get( "Multiblocks", - "Disable Electric Implosion Compressor piston", - false, - "This switch completely disables piston animation in Electric Implosion Compressor multiblock") - .getBoolean(false); + "Void Miner Blacklist", + new String[0], + "This is a blacklist for the Void Miner, blacklisted ores will not enter the drop prize pool. Please fill in the Unique Identifier of Ore and connect Damage with a colon, For example: gregtech:gt.blockores:32") + .getStringList()))); + ConfigHandler.disablePistonInEIC = ConfigHandler.c + .get( + "Multiblocks", + "Disable Electric Implosion Compressor piston", + false, + "This switch completely disables piston animation in Electric Implosion Compressor multiblock") + .getBoolean(false); ConfigHandler.pollutionHeatedWaterPumpSecond = ConfigHandler.c - .get( - "Pollution", - "Pollution produced per second by the water pump", - ConfigHandler.pollutionHeatedWaterPumpSecond, - "How much should the Simple Stirling Water Pump produce pollution per second") - .getInt(ConfigHandler.pollutionHeatedWaterPumpSecond); - ConfigHandler.basePollutionMBFSecond = ConfigHandler.c.get( + .get( "Pollution", - "Pollution produced per tick by the MBF per ingot", - ConfigHandler.basePollutionMBFSecond, - "How much should the MBF produce pollution per tick per ingot. Then it'll be multiplied by the amount of ingots done in parallel") - .getInt(ConfigHandler.basePollutionMBFSecond); + "Pollution produced per second by the water pump", + ConfigHandler.pollutionHeatedWaterPumpSecond, + "How much should the Simple Stirling Water Pump produce pollution per second") + .getInt(ConfigHandler.pollutionHeatedWaterPumpSecond); + ConfigHandler.basePollutionMBFSecond = ConfigHandler.c.get( + "Pollution", + "Pollution produced per tick by the MBF per ingot", + ConfigHandler.basePollutionMBFSecond, + "How much should the MBF produce pollution per tick per ingot. Then it'll be multiplied by the amount of ingots done in parallel") + .getInt(ConfigHandler.basePollutionMBFSecond); if (ConfigHandler.IDOffset == 0) { ConfigHandler.IDOffset = 12600; - ConfigHandler.c.get( + ConfigHandler.c + .get( "System", "ID Offset", 12600, "ID Offset for this mod. This Mod uses " + ConfigHandler.IDU - + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") - .set(12600); + + " IDs. DO NOT CHANGE IF YOU DONT KNOW WHAT THIS IS") + .set(12600); } ConfigHandler.GTppLogDisabler = ConfigHandler.c - .get("System", "Disable GT++ Logging", false, "Enables or Disables GT++ Logging.").getBoolean(false); + .get("System", "Disable GT++ Logging", false, "Enables or Disables GT++ Logging.") + .getBoolean(false); API_ConfigValues.debugLog = ConfigHandler.c - .get("System", "Enable Debug Log", false, "Enables or Disables the debug log.").getBoolean(false); + .get("System", "Enable Debug Log", false, "Enables or Disables the debug log.") + .getBoolean(false); for (int i = 0; i < BWCoreTransformer.CLASSESBEINGTRANSFORMED.length; i++) - BWCoreTransformer.shouldTransform[i] = ConfigHandler.c.get( + BWCoreTransformer.shouldTransform[i] = ConfigHandler.c + .get( "ASM fixes", BWCoreTransformer.DESCRIPTIONFORCONFIG[i] + " in class: " - + BWCoreTransformer.CLASSESBEINGTRANSFORMED[i], - true).getBoolean(true); + + BWCoreTransformer.CLASSESBEINGTRANSFORMED[i], + true) + .getBoolean(true); ConfigHandler.enabledPatches = new boolean[BWCoreTransformer.shouldTransform.length]; ConfigHandler.enabledPatches = Arrays - .copyOf(BWCoreTransformer.shouldTransform, BWCoreTransformer.shouldTransform.length); + .copyOf(BWCoreTransformer.shouldTransform, BWCoreTransformer.shouldTransform.length); ConfigHandler.ross128BID = ConfigHandler.c - .get("CrossMod Interactions", "DimID - Ross128b", -64, "The Dim ID for Ross128b").getInt(-64); + .get("CrossMod Interactions", "DimID - Ross128b", -64, "The Dim ID for Ross128b") + .getInt(-64); ConfigHandler.ross128BAID = ConfigHandler.c - .get("CrossMod Interactions", "DimID - Ross128ba", -63, "The Dim ID for Ross128ba (Ross128b's Moon)") - .getInt(-63); + .get("CrossMod Interactions", "DimID - Ross128ba", -63, "The Dim ID for Ross128ba (Ross128b's Moon)") + .getInt(-63); ConfigHandler.ross128btier = ConfigHandler.c - .get("CrossMod Interactions", "Rocket Tier - Ross128b", 3, "The Rocket Tier for Ross128b").getInt(3); + .get("CrossMod Interactions", "Rocket Tier - Ross128b", 3, "The Rocket Tier for Ross128b") + .getInt(3); ConfigHandler.ross128batier = ConfigHandler.c - .get("CrossMod Interactions", "Rocket Tier - Ross128ba", 3, "The Rocket Tier for Ross128a").getInt(3); + .get("CrossMod Interactions", "Rocket Tier - Ross128ba", 3, "The Rocket Tier for Ross128a") + .getInt(3); ConfigHandler.ross128bRuinChance = ConfigHandler.c - .get("CrossMod Interactions", "Ruin Chance - Ross128b", 512, "Higher Values mean lesser Ruins.") - .getInt(512); + .get("CrossMod Interactions", "Ruin Chance - Ross128b", 512, "Higher Values mean lesser Ruins.") + .getInt(512); ConfigHandler.Ross128Enabled = ConfigHandler.c - .get( - "CrossMod Interactions", - "Galacticraft - Activate Ross128 System", - true, - "If the Ross128 System should be activated, DO NOT CHANGE AFTER WORLD GENERATION") - .getBoolean(true); - ConfigHandler.landerType = ConfigHandler.c.get( + .get( "CrossMod Interactions", - "LanderType", - 3, - "1 = Moon Lander, 2 = Landing Balloons, 3 = Asteroid Lander").getInt(3); + "Galacticraft - Activate Ross128 System", + true, + "If the Ross128 System should be activated, DO NOT CHANGE AFTER WORLD GENERATION") + .getBoolean(true); + ConfigHandler.landerType = ConfigHandler.c + .get("CrossMod Interactions", "LanderType", 3, "1 = Moon Lander, 2 = Landing Balloons, 3 = Asteroid Lander") + .getInt(3); ConfigHandler.disableMagicalForest = ConfigHandler.c - .get( - "CrossMod Interactions", - "Disable Magical Forest - Ross128b", - false, - "True disables the magical Forest Biome on Ross for more performance during World generation.") - .getBoolean(false); + .get( + "CrossMod Interactions", + "Disable Magical Forest - Ross128b", + false, + "True disables the magical Forest Biome on Ross for more performance during World generation.") + .getBoolean(false); ConfigHandler.maxTierRoss = (byte) ConfigHandler.c - .get("Ross Ruin Metas", "A_Ruin Machine Tiers", 6, "", 0, VOLTAGE_NAMES.length).getInt(6); + .get("Ross Ruin Metas", "A_Ruin Machine Tiers", 6, "", 0, VOLTAGE_NAMES.length) + .getInt(6); ConfigHandler.metasForTiers = new int[4][maxTierRoss][]; for (int i = 0; i < 4; i++) { if (maxTierRoss > ConfigHandler.defaultMetasForTiers[i].length) ConfigHandler.defaultMetasForTiers[i] = new int[maxTierRoss][0]; - for (int j = 0; j < maxTierRoss; j++) ConfigHandler.metasForTiers[i][j] = ConfigHandler.c.get( + for (int j = 0; j < maxTierRoss; j++) ConfigHandler.metasForTiers[i][j] = ConfigHandler.c + .get( "Ross Ruin Metas", j + "_Ruin " + names[i] + " Tier " + VOLTAGE_NAMES[j], - ConfigHandler.defaultMetasForTiers[i][j]).getIntList(); + ConfigHandler.defaultMetasForTiers[i][j]) + .getIntList(); } ConfigHandler.setUpComments(); @@ -305,8 +327,8 @@ public class ConfigHandler { ConfigHandler.c.addCustomCategoryComment("Multiblocks", "Multiblock Options can be set here."); ConfigHandler.c.addCustomCategoryComment("System", "Different System Settings can be set here."); ConfigHandler.c.addCustomCategoryComment( - "CrossMod Interactions", - "CrossMod Interaction Settings can be set here. For Underground Fluid settings change the Gregtech.cfg!"); + "CrossMod Interactions", + "CrossMod Interaction Settings can be set here. For Underground Fluid settings change the Gregtech.cfg!"); ConfigHandler.c.addCustomCategoryComment("Ross Ruin Metas", "Ruin Metas and Tiers can be set here."); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java index b3791b51d6..f512e778bc 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java @@ -38,9 +38,9 @@ import gregtech.api.util.GT_LanguageManager; public class BW_ItemBlocks extends ItemBlock { private final String mNoMobsToolTip = GT_LanguageManager - .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); + .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); private final String mNoTileEntityToolTip = GT_LanguageManager - .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); + .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); public BW_ItemBlocks(Block par1) { super(par1); @@ -65,9 +65,9 @@ public class BW_ItemBlocks extends ItemBlock { byte tier = BorosilicateGlass.getTier(this.field_150939_a, aStack.getItemDamage()); if (tier >= 0) { aList.add( - StatCollector.translateToLocal("tooltip.glas.0.name") + " " - + BW_ColorUtil.getColorForTier(tier) - + GT_Values.VN[tier]); + StatCollector.translateToLocal("tooltip.glas.0.name") + " " + + BW_ColorUtil.getColorForTier(tier) + + GT_Values.VN[tier]); } if (this.field_150939_a instanceof ITileAddsInformation) { aList.addAll(Arrays.asList(((ITileAddsInformation) this.field_150939_a).getInfoData())); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java index 62f8b0e666..0b589bf53a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java @@ -51,30 +51,28 @@ public class BW_SimpleWindMeter extends Item { super.addInformation(itemStack, entityPlayer, list, p_77624_4_); list.add(StatCollector.translateToLocal("tooltip.windmeter.0.name")); list.add( - StatCollector.translateToLocal("tooltip.windmeter.1.name") + " " - + (this.getMaxDamage() - this.getDamage(itemStack)) - + "/" - + this.getMaxDamage()); + StatCollector.translateToLocal("tooltip.windmeter.1.name") + " " + + (this.getMaxDamage() - this.getDamage(itemStack)) + + "/" + + this.getMaxDamage()); list.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } @Override public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer entityPlayer) { if (entityPlayer.worldObj.isRemote || world == null - || WorldData.get(world) == null - || WorldData.get(world).windSim == null) - return itemStack; + || WorldData.get(world) == null + || WorldData.get(world).windSim == null) return itemStack; float windStrength = (float) WorldData.get(world).windSim.getWindAt(entityPlayer.posY); String windS = windStrength < 1f ? StatCollector.translateToLocal("tooltip.windmeter.2.name") - : windStrength < 10f ? StatCollector.translateToLocal("tooltip.windmeter.3.name") - : windStrength < 20f ? StatCollector.translateToLocal("tooltip.windmeter.4.name") - : windStrength < 30f ? StatCollector.translateToLocal("tooltip.windmeter.5.name") - : windStrength < 50f - ? StatCollector.translateToLocal("tooltip.windmeter.6.name") - : StatCollector.translateToLocal("tooltip.windmeter.7.name"); + : windStrength < 10f ? StatCollector.translateToLocal("tooltip.windmeter.3.name") + : windStrength < 20f ? StatCollector.translateToLocal("tooltip.windmeter.4.name") + : windStrength < 30f ? StatCollector.translateToLocal("tooltip.windmeter.5.name") + : windStrength < 50f ? StatCollector.translateToLocal("tooltip.windmeter.6.name") + : StatCollector.translateToLocal("tooltip.windmeter.7.name"); entityPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("tooltip.windmeter.8.name") + " " + windS + ".")); + new ChatComponentText(StatCollector.translateToLocal("tooltip.windmeter.8.name") + " " + windS + ".")); itemStack.damageItem(1, entityPlayer); return itemStack; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java index fd875785a7..f58ae8d6e7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java @@ -50,7 +50,7 @@ public class BW_Stonage_Rotors extends Item implements IKineticRotor { private int dura; public BW_Stonage_Rotors(int diameter, float eff, int speed, float mRotor, int min, int max, int durability, - IKineticRotor.GearboxType type, ResourceLocation tex, String Name, String itemTex) { + IKineticRotor.GearboxType type, ResourceLocation tex, String Name, String itemTex) { this.DiaMinMax[0] = diameter; this.DiaMinMax[1] = min; this.DiaMinMax[2] = max; @@ -75,8 +75,7 @@ public class BW_Stonage_Rotors extends Item implements IKineticRotor { @Override public void addInformation(ItemStack itemStack, EntityPlayer player, List<String> info, boolean b) { info.add( - StatCollector - .translateToLocalFormatted("ic2.itemrotor.wind.info", this.DiaMinMax[1], this.DiaMinMax[2])); + StatCollector.translateToLocalFormatted("ic2.itemrotor.wind.info", this.DiaMinMax[1], this.DiaMinMax[2])); IKineticRotor.GearboxType type = null; if (Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator) { type = WATER; @@ -85,10 +84,10 @@ public class BW_Stonage_Rotors extends Item implements IKineticRotor { } info.add(StatCollector.translateToLocal("tooltip.rotor.0.name") + " " + this.DiaMinMax[0]); info.add( - StatCollector.translateToLocal("tooltip.rotor.1.name") + " " - + (this.getMaxDamageEx() - this.getDamageOfStack(itemStack)) / 100 - + "/" - + this.getMaxDamageEx() / 100); + StatCollector.translateToLocal("tooltip.rotor.1.name") + " " + + (this.getMaxDamageEx() - this.getDamageOfStack(itemStack)) / 100 + + "/" + + this.getMaxDamageEx() / 100); info.add(StatCollector.translateToLocal("tooltip.rotor.2.name") + " " + this.eff); info.add(StatCollector.translateToLocal("tooltip.rotor.3.name") + " " + this.speed); info.add(StatCollector.translateToLocal("tooltip.rotor.4.name") + " " + this.mRotor); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java index 7eaea5c3a7..f0c746dd64 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java @@ -65,21 +65,21 @@ public class Circuit_Programmer extends GT_Generic_Item implements IElectricItem this.setHasSubtypes(false); this.setCreativeTab(MainMod.BWT); GregTech_API.registerCircuitProgrammer( - s -> s.getItem() instanceof Circuit_Programmer && ElectricItem.manager.canUse(s, COST_PER_USE), - (s, p) -> { - ElectricItem.manager.use(s, COST_PER_USE, p); - return s; - }); + s -> s.getItem() instanceof Circuit_Programmer && ElectricItem.manager.canUse(s, COST_PER_USE), + (s, p) -> { + ElectricItem.manager.use(s, COST_PER_USE, p); + return s; + }); } @Override public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { super.addInformation(aStack, aPlayer, aList, aF3_H); if (aStack != null && aStack.getTagCompound() != null) aList.add( - StatCollector.translateToLocal("tooltip.cp.0.name") + " " - + (aStack.getTagCompound().getBoolean("HasChip") - ? StatCollector.translateToLocal("tooltip.bw.yes.name") - : StatCollector.translateToLocal("tooltip.bw.no.name"))); + StatCollector.translateToLocal("tooltip.cp.0.name") + " " + + (aStack.getTagCompound() + .getBoolean("HasChip") ? StatCollector.translateToLocal("tooltip.bw.yes.name") + : StatCollector.translateToLocal("tooltip.bw.no.name"))); aList.add(BW_Tooltip_Reference.ADDED_BY_BARTWORKS.get()); } @@ -174,11 +174,15 @@ public class Circuit_Programmer extends GT_Generic_Item implements IElectricItem if (tag != null && tag.getBoolean(NBT_KEY_HAS_CHIP)) { initialStack = this.createRealCircuit(tag.getByte(NBT_KEY_CHIP_CONFIG)); } - circuitSlotWidget.getMcSlot().putStack(initialStack); + circuitSlotWidget.getMcSlot() + .putStack(initialStack); builder.widget(circuitSlotWidget.setChangeListener(widget -> { - ItemStack stack = widget.getMcSlot().getStack(); - ItemStack heldItem = widget.getContext().getPlayer().getHeldItem(); + ItemStack stack = widget.getMcSlot() + .getStack(); + ItemStack heldItem = widget.getContext() + .getPlayer() + .getHeldItem(); NBTTagCompound tag2 = heldItem.getTagCompound(); if (tag2 == null) { tag2 = new NBTTagCompound(); @@ -191,17 +195,25 @@ public class Circuit_Programmer extends GT_Generic_Item implements IElectricItem tag2.setBoolean(NBT_KEY_HAS_CHIP, false); } heldItem.setTagCompound(tag2); - }).setFilter(stack -> this.isProgrammedCircuit(stack) || this.isLVCircuit(stack)) - .setBackground(ModularUITextures.ITEM_SLOT, GT_UITextures.OVERLAY_SLOT_INT_CIRCUIT).setPos(122, 60)); + }) + .setFilter(stack -> this.isProgrammedCircuit(stack) || this.isLVCircuit(stack)) + .setBackground(ModularUITextures.ITEM_SLOT, GT_UITextures.OVERLAY_SLOT_INT_CIRCUIT) + .setPos(122, 60)); for (int i = 0; i < 24; i++) { final int index = i; builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { - if (circuitSlotWidget.getMcSlot().getHasStack() - && this.isProgrammedCircuit(circuitSlotWidget.getMcSlot().getStack())) { - circuitSlotWidget.getMcSlot().putStack(this.createRealCircuit(index + 1)); + if (circuitSlotWidget.getMcSlot() + .getHasStack() + && this.isProgrammedCircuit( + circuitSlotWidget.getMcSlot() + .getStack())) { + circuitSlotWidget.getMcSlot() + .putStack(this.createRealCircuit(index + 1)); } - }).setPos(32 + i % 12 * 18, 21 + i / 12 * 18).setSize(18, 18)); + }) + .setPos(32 + i % 12 * 18, 21 + i / 12 * 18) + .setSize(18, 18)); } return builder.build(); @@ -212,12 +224,15 @@ public class Circuit_Programmer extends GT_Generic_Item implements IElectricItem } private boolean isProgrammedCircuit(ItemStack stack) { - return stack.getItem().equals(GT_Utility.getIntegratedCircuit(0).getItem()); + return stack.getItem() + .equals( + GT_Utility.getIntegratedCircuit(0) + .getItem()); } private boolean isLVCircuit(ItemStack stack) { return BW_Util.checkStackAndPrefix(stack) - && OrePrefixes.circuit.equals(GT_OreDictUnificator.getAssociation(stack).mPrefix) - && GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial.equals(Materials.Basic); + && OrePrefixes.circuit.equals(GT_OreDictUnificator.getAssociation(stack).mPrefix) + && GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial.equals(Materials.Basic); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java index 81b80f2ed7..37ecfc61d2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java @@ -78,9 +78,12 @@ public class GT_Destructopack_Item extends GT_Generic_Item implements IItemWithM public void putStack(ItemStack stack) { this.onSlotChanged(); } - }).setBackground(ModularUITextures.ITEM_SLOT, BW_UITextures.OVERLAY_SLOT_CROSS).setPos(79, 16)).widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT).setSize(17, 17) - .setPos(152, 63)); + }).setBackground(ModularUITextures.ITEM_SLOT, BW_UITextures.OVERLAY_SLOT_CROSS) + .setPos(79, 16)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT) + .setSize(17, 17) + .setPos(152, 63)); return builder.build(); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java index d099fa6131..3a132dde22 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java @@ -46,7 +46,7 @@ import ic2.api.item.IElectricItem; public class GT_Rockcutter_Item extends ItemTool implements IElectricItem { private static Set<Block> mineableBlocks = Sets - .newHashSet(Blocks.stone, Blocks.cobblestone, Blocks.sand, Blocks.clay); + .newHashSet(Blocks.stone, Blocks.cobblestone, Blocks.sand, Blocks.clay); private final int mCharge; private final int mTransfer; public int mTier; @@ -81,7 +81,8 @@ public class GT_Rockcutter_Item extends ItemTool implements IElectricItem { public void onUpdate(ItemStack aStack, World worldIn, Entity entityIn, int p_77663_4_, boolean p_77663_5_) { if (!ElectricItem.manager.canUse(aStack, 500 * this.multi)) { if (aStack.isItemEnchanted()) { - aStack.getTagCompound().removeTag("ench"); + aStack.getTagCompound() + .removeTag("ench"); } } else if (!aStack.isItemEnchanted()) { aStack.addEnchantment(Enchantment.silkTouch, 3); @@ -90,14 +91,14 @@ public class GT_Rockcutter_Item extends ItemTool implements IElectricItem { @Override public boolean onItemUse(ItemStack aStack, EntityPlayer aPlayer, World p_77648_3_, int p_77648_4_, int p_77648_5_, - int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { + int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { ElectricItem.manager.use(aStack, 0, aPlayer); return false; } @Override public boolean onBlockDestroyed(ItemStack var1, World var2, Block var3, int var4, int var5, int var6, - EntityLivingBase var7) { + EntityLivingBase var7) { ElectricItem.manager.use(var1, 0, var7); if (ElectricItem.manager.canUse(var1, 500 * this.multi)) { ElectricItem.manager.use(var1, 500 * this.multi, var7); @@ -109,13 +110,21 @@ public class GT_Rockcutter_Item extends ItemTool implements IElectricItem { @Override public boolean canHarvestBlock(Block par1Block, ItemStack itemStack) { - return par1Block.getMaterial().equals(Material.glass) || par1Block.getMaterial().equals(Material.clay) - || par1Block.getMaterial().equals(Material.packedIce) - || par1Block.getMaterial().equals(Material.ice) - || par1Block.getMaterial().equals(Material.sand) - || par1Block.getMaterial().equals(Material.ground) - || par1Block.getMaterial().equals(Material.rock) - || mineableBlocks.contains(par1Block); + return par1Block.getMaterial() + .equals(Material.glass) + || par1Block.getMaterial() + .equals(Material.clay) + || par1Block.getMaterial() + .equals(Material.packedIce) + || par1Block.getMaterial() + .equals(Material.ice) + || par1Block.getMaterial() + .equals(Material.sand) + || par1Block.getMaterial() + .equals(Material.ground) + || par1Block.getMaterial() + .equals(Material.rock) + || mineableBlocks.contains(par1Block); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java index bc07762505..6728a791e4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java @@ -71,8 +71,8 @@ public class GT_Teslastaff_Item extends ItemTool implements IElectricItem { if (aTarget instanceof EntityLiving tTarget && ElectricItem.manager.canUse(aStack, 9000000)) { ElectricItem.manager.use(aStack, 9000000, aPlayer); for (int i = 1; i < 5; ++i) { - if (tTarget.getEquipmentInSlot(i) != null - && tTarget.getEquipmentInSlot(i).getItem() instanceof IElectricItem) { + if (tTarget.getEquipmentInSlot(i) != null && tTarget.getEquipmentInSlot(i) + .getItem() instanceof IElectricItem) { tTarget.setCurrentItemOrArmor(i, null); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java index b18029411f..cb5a65c13b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java @@ -47,8 +47,13 @@ public class LabParts extends SimpleSubItemClass { if (itemStack == null || itemStack.getTagCompound() == null) return EnumRarity.common; return switch (itemStack.getItemDamage()) { - case 0 -> BW_Util.getRarityFromByte(itemStack.getTagCompound().getCompoundTag("DNA").getByte("Rarity")); - case 1, 2 -> BW_Util.getRarityFromByte(itemStack.getTagCompound().getByte("Rarity")); + case 0 -> BW_Util.getRarityFromByte( + itemStack.getTagCompound() + .getCompoundTag("DNA") + .getByte("Rarity")); + case 1, 2 -> BW_Util.getRarityFromByte( + itemStack.getTagCompound() + .getByte("Rarity")); default -> EnumRarity.common; }; } @@ -57,9 +62,12 @@ public class LabParts extends SimpleSubItemClass { @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int p_82790_2_) { if (stack.getItemDamage() == 0 && stack.getTagCompound() != null - && stack.getTagCompound().getIntArray("Color") != null - && stack.getTagCompound().getIntArray("Color").length > 0) { - int[] rgb = stack.getTagCompound().getIntArray("Color"); + && stack.getTagCompound() + .getIntArray("Color") != null + && stack.getTagCompound() + .getIntArray("Color").length > 0) { + int[] rgb = stack.getTagCompound() + .getIntArray("Color"); return BW_ColorUtil.getColorFromRGBArray(rgb); } return super.getColorFromItemStack(stack, p_82790_2_); @@ -93,29 +101,35 @@ public class LabParts extends SimpleSubItemClass { return; } - BioCulture culture = BioCulture.getBioCulture(itemStack.getTagCompound().getString("Name")); + BioCulture culture = BioCulture.getBioCulture( + itemStack.getTagCompound() + .getString("Name")); switch (itemStack.getItemDamage()) { case 0: list.add( - StatCollector.translateToLocal("tooltip.labparts.5.name") + " " - + itemStack.getTagCompound().getString("Name") - + (culture != null ? " (" + culture.getLocalisedName() + ")" : "")); - if (!itemStack.getTagCompound().getBoolean("Breedable")) { + StatCollector.translateToLocal("tooltip.labparts.5.name") + " " + + itemStack.getTagCompound() + .getString("Name") + + (culture != null ? " (" + culture.getLocalisedName() + ")" : "")); + if (!itemStack.getTagCompound() + .getBoolean("Breedable")) { list.add(StatCollector.translateToLocal("tooltip.labparts.6.name")); } break; case 1: list.add( - StatCollector.translateToLocal("tooltip.labparts.7.name") + " " - + itemStack.getTagCompound().getString("Name") - + (culture != null ? " (" + culture.getLocalisedName() + ")" : "")); + StatCollector.translateToLocal("tooltip.labparts.7.name") + " " + + itemStack.getTagCompound() + .getString("Name") + + (culture != null ? " (" + culture.getLocalisedName() + ")" : "")); break; case 2: list.add( - StatCollector.translateToLocal("tooltip.labparts.8.name") + " " - + itemStack.getTagCompound().getString("Name") - + (culture != null ? " (" + culture.getLocalisedName() + ")" : "")); + StatCollector.translateToLocal("tooltip.labparts.8.name") + " " + + itemStack.getTagCompound() + .getString("Name") + + (culture != null ? " (" + culture.getLocalisedName() + ")" : "")); break; default: break; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java index 32b366440b..6268342cce 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java @@ -31,125 +31,168 @@ public class ArtificialMicaLine { public static void runArtificialMicaRecipe() { // Mg + O = MgO - GT_Values.RA.stdBuilder().itemInputs(Materials.Magnesium.getDust(1)).itemOutputs(Materials.Magnesia.getDust(2)) - .fluidInputs(Materials.Oxygen.getGas(1000)).duration(2 * SECONDS).eut(8).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Magnesium.getDust(1)) + .itemOutputs(Materials.Magnesia.getDust(2)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .duration(2 * SECONDS) + .eut(8) + .addTo(UniversalChemical); // Si + 6HF = H2SiF6 + 4H - GT_Values.RA.stdBuilder().itemInputs(Materials.Silicon.getDust(1), Materials.Empty.getCells(4)) - .itemOutputs(Materials.Hydrogen.getCells(4)).fluidInputs(Materials.HydrofluoricAcid.getFluid(6000)) - .fluidOutputs(WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000)).duration(20 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Silicon.getDust(1), Materials.Empty.getCells(4)) + .itemOutputs(Materials.Hydrogen.getCells(4)) + .fluidInputs(Materials.HydrofluoricAcid.getFluid(6000)) + .fluidOutputs(WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // K + Cl = KCl - GT_Values.RA.stdBuilder().itemInputs(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.RockSalt.getDust(2)).fluidInputs(Materials.Chlorine.getGas(1000)) - .duration(20 * TICKS).eut(8).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.RockSalt.getDust(2)) + .fluidInputs(Materials.Chlorine.getGas(1000)) + .duration(20 * TICKS) + .eut(8) + .addTo(UniversalChemical); // 2KCl + H2SiF6 = 2HCl + K2SiF6 - GT_Values.RA.stdBuilder().itemInputs(Materials.RockSalt.getDust(4)) - .itemOutputs(WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 9)) - .fluidInputs(WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(2000)).duration(1 * SECONDS).eut(8) - .addTo(mixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.RockSalt.getDust(4)) + .itemOutputs(WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 9)) + .fluidInputs(WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(2000)) + .duration(1 * SECONDS) + .eut(8) + .addTo(mixerRecipes); // 2K + CO2 + O = K2CO3 - GT_Values.RA.stdBuilder().itemInputs(Materials.Potassium.getDust(2), Materials.CarbonDioxide.getCells(1)) - .itemOutputs(WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Oxygen.getGas(1000)).duration(2 * SECONDS).eut(8).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Potassium.getDust(2), Materials.CarbonDioxide.getCells(1)) + .itemOutputs(WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .duration(2 * SECONDS) + .eut(8) + .addTo(UniversalChemical); // K2O + CO2 = K2CO3 - GT_Values.RA.stdBuilder().itemInputs(Materials.Potash.getDust(3), Materials.CarbonDioxide.getCells(1)) - .itemOutputs(WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), Materials.Empty.getCells(1)) - .duration(2 * SECONDS).eut(8).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Potash.getDust(3), Materials.CarbonDioxide.getCells(1)) + .itemOutputs(WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), Materials.Empty.getCells(1)) + .duration(2 * SECONDS) + .eut(8) + .addTo(UniversalChemical); // 55Quartz Dust + 20K2SiF6 + 12Al2O3 + 4K2CO3 = 91Raw Fluorophlogopite Dust GT_Values.RA.stdBuilder() - .itemInputs( - Materials.QuartzSand.getDust(55), - WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), - WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), - WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs( - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(mixerRecipes); + .itemInputs( + Materials.QuartzSand.getDust(55), + WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), + WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), + WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(mixerRecipes); // 55Quartzite/Nether Quartz Dust + 20K2SiF6 + 57Al2O3 + 4K2CO3 = 136Raw Fluorophlogopite Dust GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Quartzite.getDust(55), - WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), - WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57), - WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs( - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8)) - .fluidInputs().fluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(mixerRecipes); + .itemInputs( + Materials.Quartzite.getDust(55), + WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), + WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57), + WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8)) + .fluidInputs() + .fluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.NetherQuartz.getDust(55), - WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), - WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57), - WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs( - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8)) - .duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(mixerRecipes); + .itemInputs( + Materials.NetherQuartz.getDust(55), + WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), + WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57), + WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(mixerRecipes); // 62Certus Quartz Dust + 10K2SiF6 + 12Al2O3 + 7K2CO3 = 91Raw Fluorophlogopite Dust GT_Values.RA.stdBuilder() - .itemInputs( - Materials.CertusQuartz.getDust(62), - WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 10), - WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), - WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 7), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs( - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27)) - .duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(mixerRecipes); + .itemInputs( + Materials.CertusQuartz.getDust(62), + WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 10), + WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), + WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 7), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(mixerRecipes); // MgO(s) = MgO(l) - GT_Values.RA.stdBuilder().itemInputs(Materials.Magnesia.getDust(1)) - .fluidOutputs(Materials.Magnesia.getMolten(144)).duration(20 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(fluidExtractionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Magnesia.getDust(1)) + .fluidOutputs(Materials.Magnesia.getMolten(144)) + .duration(20 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(fluidExtractionRecipes); // 27Raw Fluorophlogopite Dust + 720MgO(l) = 4608Fluorophlogopite(l) - GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27)) - .itemOutputs(Materials.Glass.getDust(1)).fluidInputs(BW_GT_MaterialReference.Magnesia.getMolten(720)) - .fluidOutputs(WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(4608)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_HV).metadata(COIL_HEAT, 1700).addTo(blastFurnaceRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27)) + .itemOutputs(Materials.Glass.getDust(1)) + .fluidInputs(BW_GT_MaterialReference.Magnesia.getMolten(720)) + .fluidOutputs(WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(4608)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 1700) + .addTo(blastFurnaceRecipes); // 144Fluorophlogopite(l) = Fluorophlogopite RecipeMaps.vacuumFreezerRecipes.addRecipe( - new GT_Recipe( - false, - new ItemStack[] { ItemList.Shape_Mold_Plate.get(0) }, - new ItemStack[] { WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1) }, - null, - null, - new FluidStack[] { WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(144) }, - null, - 10, - 120, - 0)); + new GT_Recipe( + false, + new ItemStack[] { ItemList.Shape_Mold_Plate.get(0) }, + new ItemStack[] { WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1) }, + null, + null, + new FluidStack[] { WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(144) }, + null, + 10, + 120, + 0)); // Fluorophlogopite = 4Insulator Foil if (NewHorizonsCoreMod.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs( - WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 4)) - .duration(10 * TICKS).eut(600).addTo(benderRecipes); + .itemInputs( + WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 4)) + .duration(10 * TICKS) + .eut(600) + .addTo(benderRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java index cb08db3ba8..88fab90aea 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BeforeGTPreload.java @@ -47,36 +47,44 @@ public class BeforeGTPreload implements Runnable { if (didrun) return; // fixing BorosilicateGlass... -_-' Materials.BorosilicateGlass - .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_RECYCLING, SubTag.SMELTING_TO_FLUID); + .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_RECYCLING, SubTag.SMELTING_TO_FLUID); Field activeContainer = FieldUtils.getDeclaredField(LoadController.class, "activeContainer", true); ModContainer bartworks = null; - ModContainer gregtech = Loader.instance().activeModContainer(); + ModContainer gregtech = Loader.instance() + .activeModContainer(); boolean switchback = false; LoadController modController = null; - if (!Loader.instance().activeModContainer().getModId().equals(BartWorks.ID)) { + if (!Loader.instance() + .activeModContainer() + .getModId() + .equals(BartWorks.ID)) { Field fieldModController = FieldUtils.getDeclaredField(Loader.class, "modController", true); try { modController = (LoadController) fieldModController.get(Loader.instance()); } catch (IllegalAccessException e) { e.printStackTrace(); - FMLCommonHandler.instance().exitJava(-1, true); + FMLCommonHandler.instance() + .exitJava(-1, true); } assert modController != null; for (ModContainer mod : modController.getActiveModList()) { - if (mod.getModId().equals(BartWorks.ID)) { + if (mod.getModId() + .equals(BartWorks.ID)) { bartworks = mod; } if (bartworks != null) break; } - if (bartworks == null || gregtech == null) FMLCommonHandler.instance().exitJava(-1, true); + if (bartworks == null || gregtech == null) FMLCommonHandler.instance() + .exitJava(-1, true); try { activeContainer.set(modController, bartworks); } catch (IllegalAccessException e) { e.printStackTrace(); - FMLCommonHandler.instance().exitJava(-1, true); + FMLCommonHandler.instance() + .exitJava(-1, true); } switchback = true; } @@ -84,7 +92,8 @@ public class BeforeGTPreload implements Runnable { Block[] bw_glasses; try { bw_glasses = (Block[]) Class.forName("com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry") - .getField("bw_glasses").get(null); + .getField("bw_glasses") + .get(null); GameRegistry.registerBlock(bw_glasses[0], BW_ItemBlocks.class, "BW_GlasBlocks"); GameRegistry.registerBlock(bw_glasses[1], BW_ItemBlocks.class, "BW_GlasBlocks2"); OreDictionary.registerOre("blockGlassHV", new ItemStack(Blocks.glass, 1, Short.MAX_VALUE)); @@ -102,14 +111,16 @@ public class BeforeGTPreload implements Runnable { OreDictionary.registerOre("blockGlassUMV", new ItemStack(bw_glasses[1], 1, 0)); } catch (IllegalAccessException | NoSuchFieldException | ClassNotFoundException e) { e.printStackTrace(); - FMLCommonHandler.instance().exitJava(-1, true); + FMLCommonHandler.instance() + .exitJava(-1, true); } if (switchback) { try { activeContainer.set(modController, gregtech); } catch (IllegalAccessException e) { e.printStackTrace(); - FMLCommonHandler.instance().exitJava(-1, true); + FMLCommonHandler.instance() + .exitJava(-1, true); } } BeforeGTPreload.didrun = true; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioCultureLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioCultureLoader.java index 04526fec5a..5bf9ff8185 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioCultureLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioCultureLoader.java @@ -25,19 +25,19 @@ import com.github.bartimaeusnek.bartworks.util.BioPlasmid; public class BioCultureLoader { public static final BioData BIO_DATA_BETA_LACMATASE = BioData - .createAndRegisterBioData("beta-Lactamase", EnumRarity.uncommon, 10000, 0); + .createAndRegisterBioData("beta-Lactamase", EnumRarity.uncommon, 10000, 0); private static final BioData BIO_DATA_YEAST = BioData - .createAndRegisterBioData("Saccharomyces cerevisiae", EnumRarity.common); + .createAndRegisterBioData("Saccharomyces cerevisiae", EnumRarity.common); private static final BioDNA BIO_DNA_WHINE_YEAST = BioDNA - .createAndRegisterBioDNA("Saccharomyces cerevisiae var bayanus", EnumRarity.uncommon); + .createAndRegisterBioDNA("Saccharomyces cerevisiae var bayanus", EnumRarity.uncommon); private static final BioDNA BIO_DNA_BEER_YEAST = BioDNA - .createAndRegisterBioDNA("Saccharomyces cerevisiae var cerevisiae", EnumRarity.uncommon); + .createAndRegisterBioDNA("Saccharomyces cerevisiae var cerevisiae", EnumRarity.uncommon); private static final BioData eColiData = BioData - .createAndRegisterBioData("Escherichia koli", EnumRarity.uncommon, 10000, 0); + .createAndRegisterBioData("Escherichia koli", EnumRarity.uncommon, 10000, 0); private static final BioDNA BIO_DNA_ANAEROBIC_OIL = BioDNA - .createAndRegisterBioDNA("Pseudomonas Veronii", EnumRarity.uncommon); + .createAndRegisterBioDNA("Pseudomonas Veronii", EnumRarity.uncommon); private static final BioData BIO_DATA_ANAEROBIC_OIL = BioData - .createAndRegisterBioData("Pseudomonas Veronii", EnumRarity.uncommon, 5000, 1); + .createAndRegisterBioData("Pseudomonas Veronii", EnumRarity.uncommon, 5000, 1); public static BioCulture CommonYeast; public static BioCulture WhineYeast; public static BioCulture BeerYeast; @@ -48,50 +48,50 @@ public class BioCultureLoader { public static void run() { BioCultureLoader.CommonYeast = BioCulture.createAndRegisterBioCulture( - new Color(255, 248, 200), - "Saccharomyces cerevisiae", - BioPlasmid.convertDataToPlasmid(BioCultureLoader.BIO_DATA_YEAST), - BioDNA.convertDataToDNA(BioCultureLoader.BIO_DATA_YEAST), - true); + new Color(255, 248, 200), + "Saccharomyces cerevisiae", + BioPlasmid.convertDataToPlasmid(BioCultureLoader.BIO_DATA_YEAST), + BioDNA.convertDataToDNA(BioCultureLoader.BIO_DATA_YEAST), + true); BioCultureLoader.WhineYeast = BioCulture.createAndRegisterBioCulture( - new Color(255, 248, 200), - "Saccharomyces cerevisiae var bayanus", - BioPlasmid.convertDataToPlasmid(BioCultureLoader.BIO_DNA_WHINE_YEAST), - BioCultureLoader.BIO_DNA_WHINE_YEAST, - EnumRarity.uncommon, - true); + new Color(255, 248, 200), + "Saccharomyces cerevisiae var bayanus", + BioPlasmid.convertDataToPlasmid(BioCultureLoader.BIO_DNA_WHINE_YEAST), + BioCultureLoader.BIO_DNA_WHINE_YEAST, + EnumRarity.uncommon, + true); BioCultureLoader.BeerYeast = BioCulture.createAndRegisterBioCulture( - new Color(255, 248, 200), - "Saccharomyces cerevisiae var cerevisiae", - BioPlasmid.convertDataToPlasmid(BioCultureLoader.BIO_DNA_BEER_YEAST), - BioCultureLoader.BIO_DNA_BEER_YEAST, - EnumRarity.uncommon, - true); + new Color(255, 248, 200), + "Saccharomyces cerevisiae var cerevisiae", + BioPlasmid.convertDataToPlasmid(BioCultureLoader.BIO_DNA_BEER_YEAST), + BioCultureLoader.BIO_DNA_BEER_YEAST, + EnumRarity.uncommon, + true); BioCultureLoader.rottenFleshBacteria = BioCulture.createAndRegisterBioCulture( - new Color(110, 40, 25), - "Escherichia cadaver", - BioPlasmid.convertDataToPlasmid(BioCultureLoader.BIO_DATA_BETA_LACMATASE), - BioDNA.convertDataToDNA(BioCultureLoader.BIO_DATA_BETA_LACMATASE), - false); + new Color(110, 40, 25), + "Escherichia cadaver", + BioPlasmid.convertDataToPlasmid(BioCultureLoader.BIO_DATA_BETA_LACMATASE), + BioDNA.convertDataToDNA(BioCultureLoader.BIO_DATA_BETA_LACMATASE), + false); BioCultureLoader.eColi = BioCulture.createAndRegisterBioCulture( - new Color(149, 132, 75), - "Escherichia koli", - BioPlasmid.convertDataToPlasmid(BioCultureLoader.eColiData), - BioDNA.convertDataToDNA(BioCultureLoader.eColiData), - true); + new Color(149, 132, 75), + "Escherichia koli", + BioPlasmid.convertDataToPlasmid(BioCultureLoader.eColiData), + BioDNA.convertDataToDNA(BioCultureLoader.eColiData), + true); BioCultureLoader.anaerobicOil = BioCulture.createAndRegisterBioCulture( - new Color(0, 0, 0), - "Pseudomonas Veronii", - BioPlasmid.convertDataToPlasmid(BioCultureLoader.BIO_DNA_ANAEROBIC_OIL), - BioDNA.convertDataToDNA(BioCultureLoader.BIO_DATA_ANAEROBIC_OIL), - true); + new Color(0, 0, 0), + "Pseudomonas Veronii", + BioPlasmid.convertDataToPlasmid(BioCultureLoader.BIO_DNA_ANAEROBIC_OIL), + BioDNA.convertDataToDNA(BioCultureLoader.BIO_DATA_ANAEROBIC_OIL), + true); BioCultureLoader.generalPurposeFermentingBacteria = BioCulture.createAndRegisterBioCulture( - new Color(127, 69, 26), - "Saccharomyces escherichia", - BioCultureLoader.CommonYeast.getPlasmid(), - BioCultureLoader.eColi.getdDNA(), - EnumRarity.epic, - true); + new Color(127, 69, 26), + "Saccharomyces escherichia", + BioCultureLoader.CommonYeast.getPlasmid(), + BioCultureLoader.eColi.getdDNA(), + EnumRarity.epic, + true); BioCultureLoader.CommonYeast.setLocalisedName("Common Yeast"); BioCultureLoader.WhineYeast.setLocalisedName("Whine Yeast"); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java index ed0489c9a3..8b86d4cd93 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java @@ -33,14 +33,14 @@ public class BioItemList { private BioItemList() {} private static final Item mItemBioLabParts = new LabModule( - new String[] { "DNAExtractionModule", "PCRThermoclyclingModule", "PlasmidSynthesisModule", - "TransformationModule", "ClonalCellularSynthesisModule" }); + new String[] { "DNAExtractionModule", "PCRThermoclyclingModule", "PlasmidSynthesisModule", + "TransformationModule", "ClonalCellularSynthesisModule" }); public static final ItemStack[] mBioLabParts = { new ItemStack(BioItemList.mItemBioLabParts), - new ItemStack(BioItemList.mItemBioLabParts, 1, 1), new ItemStack(BioItemList.mItemBioLabParts, 1, 2), - new ItemStack(BioItemList.mItemBioLabParts, 1, 3), new ItemStack(BioItemList.mItemBioLabParts, 1, 4) }; + new ItemStack(BioItemList.mItemBioLabParts, 1, 1), new ItemStack(BioItemList.mItemBioLabParts, 1, 2), + new ItemStack(BioItemList.mItemBioLabParts, 1, 3), new ItemStack(BioItemList.mItemBioLabParts, 1, 4) }; private static final Item vanillaBioLabParts = new LabParts( - new String[] { "petriDish", "DNASampleFlask", "PlasmidCell", "DetergentPowder", "Agarose", - "IncubationModule", "PlasmaMembrane" }); + new String[] { "petriDish", "DNASampleFlask", "PlasmidCell", "DetergentPowder", "Agarose", "IncubationModule", + "PlasmaMembrane" }); public static void registerBioItems() { GameRegistry.registerItem(BioItemList.mItemBioLabParts, "BioLabModules"); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java index e4f2c73e32..abed08eb5e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java @@ -41,121 +41,121 @@ public class BioRecipeLoader { public static void registerWaterBasedBioLabIncubations() { FluidStack[] easyFluids = { Materials.Water.getFluid(1000L), - FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; + FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; for (FluidStack fluidStack : easyFluids) { BWRecipes.instance.addBioLabRecipeIncubation( - new ItemStack(Items.rotten_flesh), - BioCultureLoader.rottenFleshBacteria, - new int[] { 3300 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); + new ItemStack(Items.rotten_flesh), + BioCultureLoader.rottenFleshBacteria, + new int[] { 3300 }, + new FluidStack[] { fluidStack }, + 500, + (int) TierEU.RECIPE_HV, + BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( - new ItemStack(Items.fermented_spider_eye), - BioCultureLoader.eColi, - new int[] { 4500 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); + new ItemStack(Items.fermented_spider_eye), + BioCultureLoader.eColi, + new int[] { 4500 }, + new FluidStack[] { fluidStack }, + 500, + (int) TierEU.RECIPE_HV, + BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( - ItemList.Food_Dough.get(1L), - BioCultureLoader.CommonYeast, - new int[] { 7500 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); + ItemList.Food_Dough.get(1L), + BioCultureLoader.CommonYeast, + new int[] { 7500 }, + new FluidStack[] { fluidStack }, + 500, + (int) TierEU.RECIPE_HV, + BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( - ItemList.Food_Dough_Sugar.get(1L), - BioCultureLoader.WhineYeast, - new int[] { 2500 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); + ItemList.Food_Dough_Sugar.get(1L), + BioCultureLoader.WhineYeast, + new int[] { 2500 }, + new FluidStack[] { fluidStack }, + 500, + (int) TierEU.RECIPE_HV, + BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( - ItemList.Bottle_Wine.get(1L), - BioCultureLoader.WhineYeast, - new int[] { 3300 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); + ItemList.Bottle_Wine.get(1L), + BioCultureLoader.WhineYeast, + new int[] { 3300 }, + new FluidStack[] { fluidStack }, + 500, + (int) TierEU.RECIPE_HV, + BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( - ItemList.Bottle_Beer.get(1L), - BioCultureLoader.BeerYeast, - new int[] { 2500 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); + ItemList.Bottle_Beer.get(1L), + BioCultureLoader.BeerYeast, + new int[] { 2500 }, + new FluidStack[] { fluidStack }, + 500, + (int) TierEU.RECIPE_HV, + BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( - ItemList.Bottle_Dark_Beer.get(1L), - BioCultureLoader.BeerYeast, - new int[] { 3300 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); + ItemList.Bottle_Dark_Beer.get(1L), + BioCultureLoader.BeerYeast, + new int[] { 3300 }, + new FluidStack[] { fluidStack }, + 500, + (int) TierEU.RECIPE_HV, + BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( - new ItemStack(Blocks.dirt), - BioCultureLoader.anaerobicOil, - new int[] { 100 }, - new FluidStack[] { fluidStack }, - 1500, - (int) TierEU.RECIPE_EV, - BW_Util.STANDART); + new ItemStack(Blocks.dirt), + BioCultureLoader.anaerobicOil, + new int[] { 100 }, + new FluidStack[] { fluidStack }, + 1500, + (int) TierEU.RECIPE_EV, + BW_Util.STANDART); } } public static void registerWaterBasedBacterialVatRecipes() { FluidStack[] easyFluids = { Materials.Water.getFluid(1000L), - FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; + FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; for (FluidStack fluidStack : easyFluids) { if (CropsPlusPlus.isModLoaded()) { BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { new ItemStack(Items.sugar, 64) }, - new FluidStack[] { new FluidStack(fluidStack, 100) }, - BioCultureLoader.CommonYeast, - new FluidStack[] { FluidRegistry.getFluidStack("potion.ghp", 1) }, - 350, - (int) TierEU.RECIPE_EV); + new ItemStack[] { new ItemStack(Items.sugar, 64) }, + new FluidStack[] { new FluidStack(fluidStack, 100) }, + BioCultureLoader.CommonYeast, + new FluidStack[] { FluidRegistry.getFluidStack("potion.ghp", 1) }, + 350, + (int) TierEU.RECIPE_EV); } BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { ItemList.Crop_Drop_Grapes.get(16) }, - new FluidStack[] { new FluidStack(fluidStack, 100) }, - BioCultureLoader.WhineYeast, - new FluidStack[] { FluidRegistry.getFluidStack("potion.wine", 12) }, - 200, - (int) TierEU.RECIPE_MV); + new ItemStack[] { ItemList.Crop_Drop_Grapes.get(16) }, + new FluidStack[] { new FluidStack(fluidStack, 100) }, + BioCultureLoader.WhineYeast, + new FluidStack[] { FluidRegistry.getFluidStack("potion.wine", 12) }, + 200, + (int) TierEU.RECIPE_MV); BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { new ItemStack(Items.sugar, 4), ItemList.IC2_Hops.get(16L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 8L) }, - new FluidStack[] { new FluidStack(fluidStack, 100) }, - BioCultureLoader.BeerYeast, - new FluidStack[] { FluidRegistry.getFluidStack("potion.beer", 5) }, - 600, - (int) TierEU.RECIPE_LV); + new ItemStack[] { new ItemStack(Items.sugar, 4), ItemList.IC2_Hops.get(16L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 8L) }, + new FluidStack[] { new FluidStack(fluidStack, 100) }, + BioCultureLoader.BeerYeast, + new FluidStack[] { FluidRegistry.getFluidStack("potion.beer", 5) }, + 600, + (int) TierEU.RECIPE_LV); BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { ItemList.IC2_Hops.get(32L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 16L) }, - new FluidStack[] { new FluidStack(fluidStack, 100) }, - BioCultureLoader.BeerYeast, - new FluidStack[] { FluidRegistry.getFluidStack("potion.darkbeer", 10) }, - 600, - (int) TierEU.RECIPE_LV); + new ItemStack[] { ItemList.IC2_Hops.get(32L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 16L) }, + new FluidStack[] { new FluidStack(fluidStack, 100) }, + BioCultureLoader.BeerYeast, + new FluidStack[] { FluidRegistry.getFluidStack("potion.darkbeer", 10) }, + 600, + (int) TierEU.RECIPE_LV); } } @@ -163,31 +163,32 @@ public class BioRecipeLoader { registerWaterBasedBacterialVatRecipes(); BWRecipes.instance.addBacterialVatRecipe( - null, - new FluidStack[] { FluidRegistry.getFluidStack("potion.grapejuice", 100) }, - BioCultureLoader.WhineYeast, - new FluidStack[] { FluidRegistry.getFluidStack("potion.wine", 12) }, - 400, - (int) TierEU.RECIPE_LV); + null, + new FluidStack[] { FluidRegistry.getFluidStack("potion.grapejuice", 100) }, + BioCultureLoader.WhineYeast, + new FluidStack[] { FluidRegistry.getFluidStack("potion.wine", 12) }, + 400, + (int) TierEU.RECIPE_LV); BWRecipes.instance.addBacterialVatRecipe( - null, - new FluidStack[] { Materials.FermentedBiomass.getFluid(10000) }, - BioCultureLoader.anaerobicOil, - new FluidStack[] { new FluidStack(FluidLoader.fulvicAcid, 1000) }, - 2748, - (int) TierEU.RECIPE_HV); + null, + new FluidStack[] { Materials.FermentedBiomass.getFluid(10000) }, + BioCultureLoader.anaerobicOil, + new FluidStack[] { new FluidStack(FluidLoader.fulvicAcid, 1000) }, + 2748, + (int) TierEU.RECIPE_HV); } public static void runOnServerStarted() { - RecipeMaps.fermentingRecipes.getAllRecipes().forEach( + RecipeMaps.fermentingRecipes.getAllRecipes() + .forEach( recipe -> BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { null }, - BioCultureLoader.generalPurposeFermentingBacteria, - recipe.mFluidInputs, - recipe.mFluidOutputs, - recipe.mDuration, - recipe.mEUt, - GT_Utility.getTier(recipe.mEUt))); + new ItemStack[] { null }, + BioCultureLoader.generalPurposeFermentingBacteria, + recipe.mFluidInputs, + recipe.mFluidOutputs, + recipe.mDuration, + recipe.mEUt, + GT_Utility.getTier(recipe.mEUt))); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java index d3da5e1373..1a7e49aaa3 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java @@ -25,23 +25,15 @@ import gregtech.api.util.GT_OreDictUnificator; public class ElectricImplosionCompressorRecipes implements Runnable { private static void addElectricImplosionRecipe(final ItemStack[] inputItems, final FluidStack[] inputFluids, - final ItemStack[] outputItems, final FluidStack[] outputFluids, final int durationInTicks, - final int EUPerTick) { - BartWorksRecipeMaps.electricImplosionCompressorRecipes.addRecipe( - false, - inputItems, - outputItems, - null, - inputFluids, - outputFluids, - durationInTicks, - EUPerTick, - 1); + final ItemStack[] outputItems, final FluidStack[] outputFluids, final int durationInTicks, + final int EUPerTick) { + BartWorksRecipeMaps.electricImplosionCompressorRecipes + .addRecipe(false, inputItems, outputItems, null, inputFluids, outputFluids, durationInTicks, EUPerTick, 1); } private static final ItemStack[] circuits = { ItemList.Circuit_ExoticProcessor.get(1), - ItemList.Circuit_OpticalAssembly.get(1), ItemList.Circuit_Biowaresupercomputer.get(1), - ItemList.Circuit_Wetwaremainframe.get(1) }; + ItemList.Circuit_OpticalAssembly.get(1), ItemList.Circuit_Biowaresupercomputer.get(1), + ItemList.Circuit_Wetwaremainframe.get(1) }; @Override public void run() { @@ -50,127 +42,127 @@ public class ElectricImplosionCompressorRecipes implements Runnable { if (EternalSingularity.isModLoaded()) { addElectricImplosionRecipe( - // IN. - new ItemStack[] { GT_Values.NI }, - new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(72L) }, - // OUT. - new ItemStack[] { getModItem(EternalSingularity.ID, "eternal_singularity", 1L) }, - new FluidStack[] { GT_Values.NF }, - // Recipe stats. - 100 * 20, - (int) TierEU.RECIPE_UMV); + // IN. + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(72L) }, + // OUT. + new ItemStack[] { getModItem(EternalSingularity.ID, "eternal_singularity", 1L) }, + new FluidStack[] { GT_Values.NF }, + // Recipe stats. + 100 * 20, + (int) TierEU.RECIPE_UMV); if (UniversalSingularities.isModLoaded()) // Raw Exposed Optical Chip addElectricImplosionRecipe( - // IN. - new ItemStack[] { ItemList.Circuit_Silicon_Wafer7.get(1L), - // Fluxed Electrum Singularity. - getModItem(UniversalSingularities.ID, "universal.general.singularity", 1L, 20) }, - new FluidStack[] { GT_Values.NF }, - // OUT. - new ItemStack[] { ItemList.Circuit_Chip_Optical.get(16L) }, - new FluidStack[] { GT_Values.NF }, - 5 * 20, - (int) TierEU.RECIPE_UMV); + // IN. + new ItemStack[] { ItemList.Circuit_Silicon_Wafer7.get(1L), + // Fluxed Electrum Singularity. + getModItem(UniversalSingularities.ID, "universal.general.singularity", 1L, 20) }, + new FluidStack[] { GT_Values.NF }, + // OUT. + new ItemStack[] { ItemList.Circuit_Chip_Optical.get(16L) }, + new FluidStack[] { GT_Values.NF }, + 5 * 20, + (int) TierEU.RECIPE_UMV); } addElectricImplosionRecipe( - // IN. - new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityPlutoniumNugget", 5L) }, - new FluidStack[] { Materials.Neutronium.getMolten(72L) }, - // OUT. - new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityPlutonium", 1L) }, - new FluidStack[] { GT_Values.NF }, - // Recipe stats. - 1, - (int) TierEU.RECIPE_UEV); + // IN. + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityPlutoniumNugget", 5L) }, + new FluidStack[] { Materials.Neutronium.getMolten(72L) }, + // OUT. + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityPlutonium", 1L) }, + new FluidStack[] { GT_Values.NF }, + // Recipe stats. + 1, + (int) TierEU.RECIPE_UEV); addElectricImplosionRecipe( - // IN. - new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityUraniumNugget", 5L) }, - new FluidStack[] { Materials.Neutronium.getMolten(72L) }, - // OUT. - new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityUranium", 1L) }, - new FluidStack[] { GT_Values.NF }, - // Recipe stats. - 1, - (int) TierEU.RECIPE_UEV); + // IN. + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityUraniumNugget", 5L) }, + new FluidStack[] { Materials.Neutronium.getMolten(72L) }, + // OUT. + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityUranium", 1L) }, + new FluidStack[] { GT_Values.NF }, + // Recipe stats. + 1, + (int) TierEU.RECIPE_UEV); addElectricImplosionRecipe( - // IN. - new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityThoriumNugget", 5L) }, - new FluidStack[] { Materials.Neutronium.getMolten(72L) }, - // OUT. - new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityThorium", 1L) }, - new FluidStack[] { GT_Values.NF }, - // Recipe stats. - 1, - (int) TierEU.RECIPE_UEV); + // IN. + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityThoriumNugget", 5L) }, + new FluidStack[] { Materials.Neutronium.getMolten(72L) }, + // OUT. + new ItemStack[] { getModItem(GoodGenerator.ID, "highDensityThorium", 1L) }, + new FluidStack[] { GT_Values.NF }, + // Recipe stats. + 1, + (int) TierEU.RECIPE_UEV); // Magneto material recipe for base fluid. addElectricImplosionRecipe( - // IN. - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.nanite, MaterialsUEVplus.WhiteDwarfMatter, 1L), - GT_OreDictUnificator.get(OrePrefixes.nanite, MaterialsUEVplus.Universium, 1L), - GT_OreDictUnificator.get(OrePrefixes.nanite, MaterialsUEVplus.BlackDwarfMatter, 1L) }, - new FluidStack[] { MaterialsUEVplus.RawStarMatter.getFluid(64 * 144L) }, - // OUT. - new ItemStack[] { GT_Values.NI }, - new FluidStack[] { MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(16 * 144L) }, - // Recipe stats. - 20 * 4, - (int) TierEU.RECIPE_UXV); + // IN. + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.nanite, MaterialsUEVplus.WhiteDwarfMatter, 1L), + GT_OreDictUnificator.get(OrePrefixes.nanite, MaterialsUEVplus.Universium, 1L), + GT_OreDictUnificator.get(OrePrefixes.nanite, MaterialsUEVplus.BlackDwarfMatter, 1L) }, + new FluidStack[] { MaterialsUEVplus.RawStarMatter.getFluid(64 * 144L) }, + // OUT. + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(16 * 144L) }, + // Recipe stats. + 20 * 4, + (int) TierEU.RECIPE_UXV); // Infinity Catalyst addElectricImplosionRecipe( + // IN. + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfinityCatalyst, 64L), }, + new FluidStack[] { GT_Values.NF }, + // OUT. + new ItemStack[] { getModItem(Avaritia.ID, "Resource", 1L, 5) }, + new FluidStack[] { GT_Values.NF }, + // Recipe stats. + 1 * 1, + (int) TierEU.RECIPE_UIV); + + if (UniversalSingularities.isModLoaded()) { + // Fluxed Singularity + addElectricImplosionRecipe( // IN. - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfinityCatalyst, 64L), }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.block, Materials.ElectrumFlux, 16L), }, new FluidStack[] { GT_Values.NF }, // OUT. - new ItemStack[] { getModItem(Avaritia.ID, "Resource", 1L, 5) }, + new ItemStack[] { getModItem(UniversalSingularities.ID, "universal.general.singularity", 1L, 20) }, new FluidStack[] { GT_Values.NF }, // Recipe stats. 1 * 1, (int) TierEU.RECIPE_UIV); - if (UniversalSingularities.isModLoaded()) { - // Fluxed Singularity - addElectricImplosionRecipe( - // IN. - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.block, Materials.ElectrumFlux, 16L), }, - new FluidStack[] { GT_Values.NF }, - // OUT. - new ItemStack[] { getModItem(UniversalSingularities.ID, "universal.general.singularity", 1L, 20) }, - new FluidStack[] { GT_Values.NF }, - // Recipe stats. - 1 * 1, - (int) TierEU.RECIPE_UIV); - // Iron Singularity addElectricImplosionRecipe( - // IN. - new ItemStack[] { GT_Values.NI }, - new FluidStack[] { Materials.Iron.getMolten(7296 * 9 * 144L) }, - // OUT. - new ItemStack[] { getModItem(Avaritia.ID, "Singularity", 1L, 0) }, - new FluidStack[] { GT_Values.NF }, - // Recipe stats. - 1 * 1, - (int) TierEU.RECIPE_UIV); - } - // MHDCSM V2 - addElectricImplosionRecipe( // IN. - new ItemStack[] { MaterialsUEVplus.Eternity.getNanite(1), MaterialsUEVplus.Universium.getNanite(1) }, - new FluidStack[] { MaterialsUEVplus.RawStarMatter.getFluid(128 * 144L) }, - // OUT. new ItemStack[] { GT_Values.NI }, - new FluidStack[] { MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(32 * 144L) }, + new FluidStack[] { Materials.Iron.getMolten(7296 * 9 * 144L) }, + // OUT. + new ItemStack[] { getModItem(Avaritia.ID, "Singularity", 1L, 0) }, + new FluidStack[] { GT_Values.NF }, // Recipe stats. - 20 * 4, - (int) TierEU.RECIPE_MAX); + 1 * 1, + (int) TierEU.RECIPE_UIV); + } + // MHDCSM V2 + addElectricImplosionRecipe( + // IN. + new ItemStack[] { MaterialsUEVplus.Eternity.getNanite(1), MaterialsUEVplus.Universium.getNanite(1) }, + new FluidStack[] { MaterialsUEVplus.RawStarMatter.getFluid(128 * 144L) }, + // OUT. + new ItemStack[] { GT_Values.NI }, + new FluidStack[] { MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(32 * 144L) }, + // Recipe stats. + 20 * 4, + (int) TierEU.RECIPE_MAX); this.addMagnetohydrodynamicallyConstrainedStarMatterPartRecipes(); } @@ -199,23 +191,23 @@ public class ElectricImplosionCompressorRecipes implements Runnable { } private void addWhiteDwarfMagnetoEICRecipe(final OrePrefixes part, final int multiplier, - final int circuitMultiplier) { + final int circuitMultiplier) { final int partFraction = (int) (144 * part.mMaterialAmount / M); for (ItemStack circuit : circuits) { addElectricImplosionRecipe( - new ItemStack[] { circuit.splitStack(circuitMultiplier), - getModItem(SuperSolarPanels.ID, "solarsplitter", 1, 0), - getModItem(OpenComputers.ID, "hologram2", circuitMultiplier, 0), - GT_OreDictUnificator.get(part, MaterialsUEVplus.Eternity, multiplier), }, - new FluidStack[] { MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter - .getMolten((long) partFraction * multiplier) }, - new ItemStack[] { GT_OreDictUnificator - .get(part, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, multiplier) }, - new FluidStack[] { GT_Values.NF }, - (int) (multiplier * (20 * partFraction / 144.0)), - (int) TierEU.RECIPE_UXV); + new ItemStack[] { circuit.splitStack(circuitMultiplier), + getModItem(SuperSolarPanels.ID, "solarsplitter", 1, 0), + getModItem(OpenComputers.ID, "hologram2", circuitMultiplier, 0), + GT_OreDictUnificator.get(part, MaterialsUEVplus.Eternity, multiplier), }, + new FluidStack[] { MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter + .getMolten((long) partFraction * multiplier) }, + new ItemStack[] { GT_OreDictUnificator + .get(part, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, multiplier) }, + new FluidStack[] { GT_Values.NF }, + (int) (multiplier * (20 * partFraction / 144.0)), + (int) TierEU.RECIPE_UXV); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java index c843297771..809e52e6d1 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java @@ -61,42 +61,55 @@ public class FluidLoader { renderID = RenderingRegistry.getNextAvailableRenderId(); ff = new Fluid("BWfakeFluid"); GregTech_API.sGTBlockIconload.add( - () -> ff.setIcons( - GregTech_API.sBlockIcons - .registerIcon(GregTech.getResourcePath("fluids", "fluid.molten.autogenerated")))); + () -> ff.setIcons( + GregTech_API.sBlockIcons + .registerIcon(GregTech.getResourcePath("fluids", "fluid.molten.autogenerated")))); fulvicAcid = createAndRegisterFluid("Fulvic Acid", new Color(20, 20, 20)); heatedfulvicAcid = createAndRegisterFluid("Heated Fulvic Acid", new Color(40, 20, 20), 720); Kerogen = createAndRegisterFluid("Kerogen", new Color(85, 85, 85)); BioLabFluidMaterials = new Fluid[] { createAndRegisterFluid("FluorecentdDNA", new Color(125, 50, 170)), - createAndRegisterFluid("EnzymesSollution", new Color(240, 200, 125)), - createAndRegisterFluid("Penicillin", new Color(255, 255, 255)), - createAndRegisterFluid("Polymerase", new Color(110, 180, 110)) }; + createAndRegisterFluid("EnzymesSollution", new Color(240, 200, 125)), + createAndRegisterFluid("Penicillin", new Color(255, 255, 255)), + createAndRegisterFluid("Polymerase", new Color(110, 180, 110)) }; BioLabFluidCells = new ItemStack[BioLabFluidMaterials.length]; GT_MetaGenerated_Item_98.FluidCell[] fluidCells = { GT_MetaGenerated_Item_98.FluidCell.FLUORESCENT_DNA, - GT_MetaGenerated_Item_98.FluidCell.ENZYME_SOLUTION, GT_MetaGenerated_Item_98.FluidCell.PENICILLIN, - GT_MetaGenerated_Item_98.FluidCell.POLYMERASE, }; + GT_MetaGenerated_Item_98.FluidCell.ENZYME_SOLUTION, GT_MetaGenerated_Item_98.FluidCell.PENICILLIN, + GT_MetaGenerated_Item_98.FluidCell.POLYMERASE, }; for (int i = 0; i < fluidCells.length; i++) { BioLabFluidCells[i] = fluidCells[i].get(); } FluidStack dnaFluid = Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 100) - : Materials.Biomass.getFluid(100L); + : Materials.Biomass.getFluid(100L); for (BioCulture B : BioCulture.BIO_CULTURE_ARRAY_LIST) { if (B.isBreedable()) { B.setFluid( - GT_FluidFactory.builder(B.getName().replace(" ", "").toLowerCase() + "fluid") - .withTextureName("molten.autogenerated") - .withColorRGBA( - new short[] { (short) B.getColor().getRed(), (short) B.getColor().getBlue(), - (short) B.getColor().getGreen() }) - .withLocalizedName(B.getLocalisedName() + " Fluid") - .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid()); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)) - .fluidInputs(new FluidStack(B.getFluid(), 1000)).fluidOutputs(dnaFluid).duration(25 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(centrifugeRecipes); + GT_FluidFactory.builder( + B.getName() + .replace(" ", "") + .toLowerCase() + "fluid") + .withTextureName("molten.autogenerated") + .withColorRGBA( + new short[] { (short) B.getColor() + .getRed(), + (short) B.getColor() + .getBlue(), + (short) B.getColor() + .getGreen() }) + .withLocalizedName(B.getLocalisedName() + " Fluid") + .withStateAndTemperature(FluidState.LIQUID, 300) + .buildAndRegister() + .asFluid()); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(10)) + .fluidInputs(new FluidStack(B.getFluid(), 1000)) + .fluidOutputs(dnaFluid) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(centrifugeRecipes); } } @@ -110,18 +123,24 @@ public class FluidLoader { } public static Fluid createAndRegisterFluid(String Name, Color color) { - return GT_FluidFactory.builder(Name).withTextureName("molten.autogenerated") - .withColorRGBA( - new short[] { (short) color.getRed(), (short) color.getGreen(), (short) color.getBlue(), - (short) color.getAlpha() }) - .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid(); + return GT_FluidFactory.builder(Name) + .withTextureName("molten.autogenerated") + .withColorRGBA( + new short[] { (short) color.getRed(), (short) color.getGreen(), (short) color.getBlue(), + (short) color.getAlpha() }) + .withStateAndTemperature(FluidState.LIQUID, 300) + .buildAndRegister() + .asFluid(); } public static Fluid createAndRegisterFluid(String Name, Color color, int temperature) { - return GT_FluidFactory.builder(Name).withTextureName("molten.autogenerated") - .withColorRGBA( - new short[] { (short) color.getRed(), (short) color.getGreen(), (short) color.getBlue(), - (short) color.getAlpha() }) - .withStateAndTemperature(FluidState.LIQUID, temperature).buildAndRegister().asFluid(); + return GT_FluidFactory.builder(Name) + .withTextureName("molten.autogenerated") + .withColorRGBA( + new short[] { (short) color.getRed(), (short) color.getGreen(), (short) color.getBlue(), + (short) color.getAlpha() }) + .withStateAndTemperature(FluidState.LIQUID, temperature) + .buildAndRegister() + .asFluid(); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java index 50f5fa6b76..499686e6e0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java @@ -86,140 +86,136 @@ public class ItemRegistry { public static final Item ROCKCUTTER_HV = new GT_Rockcutter_Item(3); public static final Item CIRCUIT_PROGRAMMER = new Circuit_Programmer(); public static final Block ROTORBLOCK = new BW_TileEntityContainer_MachineBlock( - Material.wood, - BW_RotorBlock.class, - "BWRotorBlock"); + Material.wood, + BW_RotorBlock.class, + "BWRotorBlock"); public static final Item LEATHER_ROTOR = new BW_Stonage_Rotors( - 7, - 0.15f, - 5, - 1.15f, - 1, - 50, - 10000000, - IKineticRotor.GearboxType.WIND, - new ResourceLocation(MainMod.MOD_ID, "textures/items/rotors/rotorLeather.png"), - "BW_LeatherRotor", - "rotors/itemRotorLeather"); + 7, + 0.15f, + 5, + 1.15f, + 1, + 50, + 10000000, + IKineticRotor.GearboxType.WIND, + new ResourceLocation(MainMod.MOD_ID, "textures/items/rotors/rotorLeather.png"), + "BW_LeatherRotor", + "rotors/itemRotorLeather"); public static final Item WOOL_ROTOR = new BW_Stonage_Rotors( - 7, - 0.18f, - 3, - 1.35f, - 1, - 50, - 9000000, - IKineticRotor.GearboxType.WIND, - new ResourceLocation(MainMod.MOD_ID, "textures/items/rotors/rotorWool.png"), - "BW_WoolRotor", - "rotors/itemRotorWool"); + 7, + 0.18f, + 3, + 1.35f, + 1, + 50, + 9000000, + IKineticRotor.GearboxType.WIND, + new ResourceLocation(MainMod.MOD_ID, "textures/items/rotors/rotorWool.png"), + "BW_WoolRotor", + "rotors/itemRotorWool"); public static final Item PAPER_ROTOR = new BW_Stonage_Rotors( - 7, - 0.2f, - 12, - 0.9f, - 1, - 50, - 800000, - IKineticRotor.GearboxType.WIND, - new ResourceLocation(MainMod.MOD_ID, "textures/items/rotors/rotorPaper.png"), - "BW_PaperRotor", - "rotors/itemRotorPaper"); + 7, + 0.2f, + 12, + 0.9f, + 1, + 50, + 800000, + IKineticRotor.GearboxType.WIND, + new ResourceLocation(MainMod.MOD_ID, "textures/items/rotors/rotorPaper.png"), + "BW_PaperRotor", + "rotors/itemRotorPaper"); public static final Item COMBINED_ROTOR = new BW_Stonage_Rotors( - 9, - 0.22f, - 7, - 1.05f, - 1, - 50, - 6000000, - IKineticRotor.GearboxType.WIND, - new ResourceLocation(MainMod.MOD_ID, "textures/items/rotors/rotorCombined.png"), - "BW_CombinedRotor", - "rotors/itemRotorCombined"); + 9, + 0.22f, + 7, + 1.05f, + 1, + 50, + 6000000, + IKineticRotor.GearboxType.WIND, + new ResourceLocation(MainMod.MOD_ID, "textures/items/rotors/rotorCombined.png"), + "BW_CombinedRotor", + "rotors/itemRotorCombined"); public static final Item CRAFTING_PARTS = new SimpleSubItemClass( - "grindstone_top", - "grindstone_bottom", - "completed_grindstone", - "rotors/leatherParts", - "rotors/woolParts", - "rotors/paperParts", - "rotors/combinedParts"); + "grindstone_top", + "grindstone_bottom", + "completed_grindstone", + "rotors/leatherParts", + "rotors/woolParts", + "rotors/paperParts", + "rotors/combinedParts"); public static final Item TAB = new SimpleIconItem("GT2Coin"); public static final Item WINDMETER = new BW_SimpleWindMeter(); public static final Block PUMPBLOCK = new BW_TileEntityContainer( - Material.anvil, - BW_TileEntity_HeatedWaterPump.class, - "BWHeatedWaterPump"); + Material.anvil, + BW_TileEntity_HeatedWaterPump.class, + "BWHeatedWaterPump"); public static final Item PUMPPARTS = new SimpleSubItemClass("BWrawtube", "BWmotor"); public static final Block EXPPUMP = new BW_TileEntityContainer( - Material.coral, - BW_TileEntity_ExperimentalFloodGate.class, - "ExpReversePump"); + Material.coral, + BW_TileEntity_ExperimentalFloodGate.class, + "ExpReversePump"); public static final Block bw_realglas = new BW_GlasBlocks( - "BW_GlasBlocks", - new String[] { MainMod.MOD_ID + ":BoronSilicateGlassBlock", - MainMod.MOD_ID + ":TitaniumReinforcedBoronSilicateGlassBlock", - MainMod.MOD_ID + ":TungstenSteelReinforcedBoronSilicateGlassBlock", - MainMod.MOD_ID + ":LuVTierMaterialReinforcedBoronSilicateGlassBlock", - MainMod.MOD_ID + ":IridiumReinforcedBoronSilicateGlassBlock", - MainMod.MOD_ID + ":OsmiumReinforcedBoronSilicateGlassBlock", - MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock1", - MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock2", - MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock3", - MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock4", - MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock5", - MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock6", MainMod.MOD_ID + ":ThoriumYttriumGlass", - MainMod.MOD_ID + ":NeutroniumReinforcedBoronSilicateGlassBlock", - MainMod.MOD_ID + ":CosmicNeutroniumReinforcedBoronSilicateGlassBlock", - MainMod.MOD_ID + ":InfinityReinforcedBoronSilicateGlassBlock", }, - new short[][] { Materials.BorosilicateGlass.getRGBA(), Materials.Titanium.getRGBA(), - Materials.TungstenSteel.getRGBA(), Materials.Chrome.getRGBA(), Materials.Iridium.getRGBA(), - Materials.Osmium.getRGBA(), new short[] { 0xff, 0, 0 }, new short[] { 0, 0xff, 0 }, - new short[] { 0x80, 0, 0xff }, new short[] { 0xff, 0xff, 0 }, new short[] { 0, 0xff, 0x80 }, - new short[] { 0x80, 0x33, 0 }, WerkstoffLoader.YttriumOxide.getRGBA(), - Materials.Neutronium.getRGBA(), Materials.CosmicNeutronium.getRGBA(), - new short[] { 0xda, 0xeb, 0xff }, }, - MainMod.BIO_TAB, - true, - false); + "BW_GlasBlocks", + new String[] { MainMod.MOD_ID + ":BoronSilicateGlassBlock", + MainMod.MOD_ID + ":TitaniumReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":TungstenSteelReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":LuVTierMaterialReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":IridiumReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":OsmiumReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock1", MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock2", + MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock3", MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock4", + MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock5", MainMod.MOD_ID + ":ColoredBoronSilicateGlassBlock6", + MainMod.MOD_ID + ":ThoriumYttriumGlass", MainMod.MOD_ID + ":NeutroniumReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":CosmicNeutroniumReinforcedBoronSilicateGlassBlock", + MainMod.MOD_ID + ":InfinityReinforcedBoronSilicateGlassBlock", }, + new short[][] { Materials.BorosilicateGlass.getRGBA(), Materials.Titanium.getRGBA(), + Materials.TungstenSteel.getRGBA(), Materials.Chrome.getRGBA(), Materials.Iridium.getRGBA(), + Materials.Osmium.getRGBA(), new short[] { 0xff, 0, 0 }, new short[] { 0, 0xff, 0 }, + new short[] { 0x80, 0, 0xff }, new short[] { 0xff, 0xff, 0 }, new short[] { 0, 0xff, 0x80 }, + new short[] { 0x80, 0x33, 0 }, WerkstoffLoader.YttriumOxide.getRGBA(), Materials.Neutronium.getRGBA(), + Materials.CosmicNeutronium.getRGBA(), new short[] { 0xda, 0xeb, 0xff }, }, + MainMod.BIO_TAB, + true, + false); public static final Block bw_realglas2 = new BW_GlasBlocks2( - "BW_GlasBlocks2", - new String[] { MainMod.MOD_ID + ":TranscendentallyReinforcedBoronSilicateGlassBlock" }, - new short[][] { new short[] { 50, 50, 50 } }, - MainMod.BIO_TAB, - true, - false); + "BW_GlasBlocks2", + new String[] { MainMod.MOD_ID + ":TranscendentallyReinforcedBoronSilicateGlassBlock" }, + new short[][] { new short[] { 50, 50, 50 } }, + MainMod.BIO_TAB, + true, + false); public static final Block[] bw_glasses = { bw_realglas, bw_realglas2 }; public static final Block bw_fake_glasses = new BW_GlasBlocks( - "BW_GlasBlocks", - new String[] { MainMod.MOD_ID + ":BoronSilicateGlassBlockRandlos" }, - null, - null, - true, - true); + "BW_GlasBlocks", + new String[] { MainMod.MOD_ID + ":BoronSilicateGlassBlockRandlos" }, + null, + null, + true, + true); public static final Block bw_fake_glasses2 = new BW_GlasBlocks2( - "BW_GlasBlocks2", - new String[] { MainMod.MOD_ID + ":BoronSilicateGlassBlockRandlos" }, - null, - null, - true, - true); + "BW_GlasBlocks2", + new String[] { MainMod.MOD_ID + ":BoronSilicateGlassBlockRandlos" }, + null, + null, + true, + true); public static final Block[] BW_BLOCKS = { - new BW_Blocks( - "BW_ItemBlocks", - new String[] { MainMod.MOD_ID + ":EtchedLapisCell", MainMod.MOD_ID + ":PlatedLapisCell", }, - GT2), - new BW_Blocks("GT_LESU_CASING", new String[] { MainMod.MOD_ID + ":LESU_CELL", }, GT2), - new BW_Blocks( - "BW_Machinery_Casings", - new String[] { MainMod.MOD_ID + ":NickelFerriteBlocks", MainMod.MOD_ID + ":TransformerCoil", - // MainMod.MOD_ID+":DEHP_Casing", - // MainMod.MOD_ID+":DEHP_Casing_Base" - }, - BWT), }; + new BW_Blocks( + "BW_ItemBlocks", + new String[] { MainMod.MOD_ID + ":EtchedLapisCell", MainMod.MOD_ID + ":PlatedLapisCell", }, + GT2), + new BW_Blocks("GT_LESU_CASING", new String[] { MainMod.MOD_ID + ":LESU_CELL", }, GT2), + new BW_Blocks( + "BW_Machinery_Casings", + new String[] { MainMod.MOD_ID + ":NickelFerriteBlocks", MainMod.MOD_ID + ":TransformerCoil", + // MainMod.MOD_ID+":DEHP_Casing", + // MainMod.MOD_ID+":DEHP_Casing_Base" + }, + BWT), }; public static ItemStack[] diode2A = new ItemStack[GT_Values.VN.length]; public static ItemStack[] diode4A = new ItemStack[GT_Values.VN.length]; @@ -273,14 +269,14 @@ public class ItemRegistry { GameRegistry.registerItem(ItemRegistry.TAB, "tabIconGT2"); if (ConfigHandler.creativeScannerID != 0) new CreativeScanner( - ConfigHandler.creativeScannerID, - "Creative Debug Scanner", - "Creative Debug Scanner", - 20); + ConfigHandler.creativeScannerID, + "Creative Debug Scanner", + "Creative Debug Scanner", + 20); ItemRegistry.eic = new GT_TileEntity_ElectricImplosionCompressor( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 6, - "ElectricImplosionCompressor", - "Electric Implosion Compressor").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 6, + "ElectricImplosionCompressor", + "Electric Implosion Compressor").getStackForm(1L); // EIC depend on neutronium block to pass on structure updates int bitmask = GregTech_API.sMachineIDs.getOrDefault(GregTech_API.sBlockMetal5, 0) | 1 << 2; @@ -295,160 +291,160 @@ public class ItemRegistry { GregTech_API.registerMachineBlock(LudicrousBlocks.resource_block, bitmask); ItemRegistry.THTR = new GT_TileEntity_THTR( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 5, - "THTR", - "Thorium High Temperature Reactor").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 5, + "THTR", + "Thorium High Temperature Reactor").getStackForm(1L); GT_TileEntity_THTR.THTRMaterials.registeraTHR_Materials(); ItemRegistry.HTGR = new GT_TileEntity_HTGR( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15 + 48, - "HTGR", - "High Temperature Gas-cooled Reactor").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15 + 48, + "HTGR", + "High Temperature Gas-cooled Reactor").getStackForm(1L); GT_TileEntity_HTGR.HTGRMaterials.registeraTHR_Materials(); // ID ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15 + 49 IS TAKEN !!! (12792) GT_OreDictUnificator - .add(OrePrefixes.block, Materials.BorosilicateGlass, new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)); + .add(OrePrefixes.block, Materials.BorosilicateGlass, new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)); GT_OreDictUnificator - .registerOre(OrePrefixes.block, Materials.NickelZincFerrite, new ItemStack(ItemRegistry.BW_BLOCKS[2])); + .registerOre(OrePrefixes.block, Materials.NickelZincFerrite, new ItemStack(ItemRegistry.BW_BLOCKS[2])); for (int i = 0; i < GT_Values.VN.length - 1; i++) { ItemRegistry.diode2A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length + 1 + i, - "diode" + "2A" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.diode.name") + " 2A " + GT_Values.VN[i], - i).getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length + 1 + i, + "diode" + "2A" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.diode.name") + " 2A " + GT_Values.VN[i], + i).getStackForm(1L); ItemRegistry.diode4A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 2 + 1 + i, - "diode" + "4A" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.diode.name") + " 4A " + GT_Values.VN[i], - i).getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 2 + 1 + i, + "diode" + "4A" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.diode.name") + " 4A " + GT_Values.VN[i], + i).getStackForm(1L); ItemRegistry.diode8A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 3 + 1 + i, - "diode" + "8A" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.diode.name") + " 8A " + GT_Values.VN[i], - i).getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 3 + 1 + i, + "diode" + "8A" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.diode.name") + " 8A " + GT_Values.VN[i], + i).getStackForm(1L); ItemRegistry.diode12A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 4 + 1 + i, - "diode" + "12A" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.diode.name") + " 12A " + GT_Values.VN[i], - i).getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 4 + 1 + i, + "diode" + "12A" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.diode.name") + " 12A " + GT_Values.VN[i], + i).getStackForm(1L); ItemRegistry.diode16A[i] = new GT_MetaTileEntity_Diode( - ConfigHandler.IDOffset + GT_Values.VN.length * 5 + 1 + i, - "diode" + "16A" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.diode.name") + " 16A " + GT_Values.VN[i], - i).getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 5 + 1 + i, + "diode" + "16A" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.diode.name") + " 16A " + GT_Values.VN[i], + i).getStackForm(1L); ItemRegistry.energyDistributor[i] = new GT_MetaTileEntity_EnergyDistributor( - ConfigHandler.IDOffset + 1 + i, - "energydistributor" + GT_Values.VN[i], - StatCollector.translateToLocal("tile.energydistributor.name") + " " + GT_Values.VN[i], - i).getStackForm(1L); + ConfigHandler.IDOffset + 1 + i, + "energydistributor" + GT_Values.VN[i], + StatCollector.translateToLocal("tile.energydistributor.name") + " " + GT_Values.VN[i], + i).getStackForm(1L); } for (int i = 0; i < 3; i++) { ItemRegistry.acidGens[i] = new GT_MetaTileEntity_AcidGenerator( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 - 2 + i, - "acidgenerator" + GT_Values.VN[i + 2], - StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[i + 2], - i + 2).getStackForm(1); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 - 2 + i, + "acidgenerator" + GT_Values.VN[i + 2], + StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[i + 2], + i + 2).getStackForm(1); } ItemRegistry.acidGensLV = new GT_MetaTileEntity_AcidGenerator( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 65, - "acidgenerator" + GT_Values.VN[1], - StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[1], - +1).getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 65, + "acidgenerator" + GT_Values.VN[1], + StatCollector.translateToLocal("tile.acidgenerator.name") + " " + GT_Values.VN[1], + +1).getStackForm(1L); ItemRegistry.dehp = new GT_TileEntity_DEHP( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 1, - 1, - "DEHP", - "Deep Earth Heating Pump").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 1, + 1, + "DEHP", + "Deep Earth Heating Pump").getStackForm(1L); ItemRegistry.megaMachines[0] = new GT_TileEntity_MegaBlastFurnace( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 2, - "MegaBlastFurnace", - StatCollector.translateToLocal("tile.bw.mbf.name")).getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 2, + "MegaBlastFurnace", + StatCollector.translateToLocal("tile.bw.mbf.name")).getStackForm(1L); ItemRegistry.megaMachines[1] = new GT_TileEntity_MegaVacuumFreezer( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 3, - "MegaVacuumFreezer", - StatCollector.translateToLocal("tile.bw.mvf.name")).getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 3, + "MegaVacuumFreezer", + StatCollector.translateToLocal("tile.bw.mvf.name")).getStackForm(1L); ItemRegistry.cal = new GT_TileEntity_CircuitAssemblyLine( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 7, - "CircuitAssemblyLine", - "Circuit Assembly Line").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 7, + "CircuitAssemblyLine", + "Circuit Assembly Line").getStackForm(1L); ItemRegistry.compressedHatch = new GT_MetaTileEntity_CompressedFluidHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 8, - "CompressedFluidHatch", - "Liquid Air Fluid Hatch").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 8, + "CompressedFluidHatch", + "Liquid Air Fluid Hatch").getStackForm(1L); ItemRegistry.giantOutputHatch = new GT_MetaTileEntity_GiantOutputHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 9, - "GiantOutputHatch", - "Giant Output Hatch").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 9, + "GiantOutputHatch", + "Giant Output Hatch").getStackForm(1L); ItemRegistry.humongousInputHatch = new GT_MetaTileEntity_HumongousInputHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 9 + 55, - "HumongousInputHatch", - "Humongous Input Hatch").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 9 + 55, + "HumongousInputHatch", + "Humongous Input Hatch").getStackForm(1L); ItemRegistry.megaMachines[2] = new GT_TileEntity_MegaDistillTower( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 10, - "MegaDistillationTower", - "Mega Distillation Tower").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 10, + "MegaDistillationTower", + "Mega Distillation Tower").getStackForm(1L); ItemRegistry.megaMachines[3] = new GT_TileEntity_MegaChemicalReactor( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 638, - "MegaChemicalReactor", - "Mega Chemical Reactor").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 638, + "MegaChemicalReactor", + "Mega Chemical Reactor").getStackForm(1L); ItemRegistry.megaMachines[4] = new GT_TileEntity_MegaOilCracker( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 639, - "MegaOilCracker", - "Mega Oil Cracker").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 639, + "MegaOilCracker", + "Mega Oil Cracker").getStackForm(1L); if (GalactiGreg.isModLoaded()) { ItemRegistry.voidminer[2] = new GT_TileEntity_VoidMiners.VMUV( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 11, - "VoidMiner3", - "Void Miner III").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 11, + "VoidMiner3", + "Void Miner III").getStackForm(1L); ItemRegistry.voidminer[1] = new GT_TileEntity_VoidMiners.VMZPM( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 12, - "VoidMiner2", - "Void Miner II").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 12, + "VoidMiner2", + "Void Miner II").getStackForm(1L); ItemRegistry.voidminer[0] = new GT_TileEntity_VoidMiners.VMLUV( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 13, - "VoidMiner1", - "Void Miner I").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 13, + "VoidMiner1", + "Void Miner I").getStackForm(1L); } if (TecTech.isModLoaded()) { TecTechPipeEnergyLowPower = new TT_MetaTileEntity_Pipe_Energy_LowPower( - ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 14, - "pipe.lowpowerlaser", - "Low Power Laser Pipe").getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 14, + "pipe.lowpowerlaser", + "Low Power Laser Pipe").getStackForm(1L); int startID = ConfigHandler.IDOffset + GT_Values.VN.length * 8 + 15; for (int amps = 32; amps <= 128; amps += 32) { for (int tier = 4; tier < 8; tier++) { TecTechLaserAdditions[0][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserBox( - startID, - GT_Values.VN[tier] + "_LPLaser_Converter_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Converter", - tier, - amps).getStackForm(1L); + startID, + GT_Values.VN[tier] + "_LPLaser_Converter_" + amps, + GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Converter", + tier, + amps).getStackForm(1L); startID++; } } for (int amps = 32; amps <= 128; amps += 32) { for (int tier = 4; tier < 8; tier++) { TecTechLaserAdditions[1][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserHatch( - startID, - GT_Values.VN[tier] + "_LPLaser_Hatch_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Target Hatch", - tier, - amps).getStackForm(1L); + startID, + GT_Values.VN[tier] + "_LPLaser_Hatch_" + amps, + GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Target Hatch", + tier, + amps).getStackForm(1L); startID++; } } for (int amps = 32; amps <= 128; amps += 32) { for (int tier = 4; tier < 8; tier++) { TecTechLaserAdditions[2][amps / 32 - 1][tier - 4] = new TT_MetaTileEntity_LowPowerLaserDynamo( - startID, - GT_Values.VN[tier] + "_LPLaser_Dynamo_" + amps, - GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Source Hatch", - tier, - amps).getStackForm(1L); + startID, + GT_Values.VN[tier] + "_LPLaser_Dynamo_" + amps, + GT_Values.VN[tier] + " " + amps + "A/t" + " Low Power Laser Source Hatch", + tier, + amps).getStackForm(1L); startID++; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/LocalisationLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/LocalisationLoader.java index 4307dca78c..020f89e703 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/LocalisationLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/LocalisationLoader.java @@ -21,40 +21,38 @@ public class LocalisationLoader { private static void localiseTooltips() { GT_LanguageManager - .addStringLocalization("metaitem.01.tooltip.purify.2", "Throw into Cauldron to get clean crushed Ore"); + .addStringLocalization("metaitem.01.tooltip.purify.2", "Throw into Cauldron to get clean crushed Ore"); GT_LanguageManager - .addStringLocalization("metaitem.01.tooltip.nqgen", "Can be used as Enriched Naquadah Fuel Substitute"); + .addStringLocalization("metaitem.01.tooltip.nqgen", "Can be used as Enriched Naquadah Fuel Substitute"); } private static void localiseAchivements() { + GT_LanguageManager + .addStringLocalization("achievement.gt.blockmachines.electricimplosioncompressor", "Electric Implosions?"); GT_LanguageManager.addStringLocalization( - "achievement.gt.blockmachines.electricimplosioncompressor", - "Electric Implosions?"); - GT_LanguageManager.addStringLocalization( - "achievement.gt.blockmachines.electricimplosioncompressor.desc", - "Basically a giant Hammer that presses Stuff - No more TNT!"); + "achievement.gt.blockmachines.electricimplosioncompressor.desc", + "Basically a giant Hammer that presses Stuff - No more TNT!"); GT_LanguageManager.addStringLocalization("achievement.gt.blockmachines.dehp", "Heat from below!"); GT_LanguageManager - .addStringLocalization("achievement.gt.blockmachines.dehp.desc", "Get ALL the thermal energy!"); + .addStringLocalization("achievement.gt.blockmachines.dehp.desc", "Get ALL the thermal energy!"); GT_LanguageManager - .addStringLocalization("achievement.gt.blockmachines.circuitassemblyline", "Cheaper Circuits?"); + .addStringLocalization("achievement.gt.blockmachines.circuitassemblyline", "Cheaper Circuits?"); GT_LanguageManager.addStringLocalization( - "achievement.gt.blockmachines.circuitassemblyline.desc", - "Well, yes, but actually no..."); + "achievement.gt.blockmachines.circuitassemblyline.desc", + "Well, yes, but actually no..."); GT_LanguageManager.addStringLocalization("achievement.gt.blockmachines.voidminer1", "Ores from deep below!"); + GT_LanguageManager + .addStringLocalization("achievement.gt.blockmachines.voidminer1.desc", "Is this some kind of Ex-Nihilo?"); GT_LanguageManager.addStringLocalization( - "achievement.gt.blockmachines.voidminer1.desc", - "Is this some kind of Ex-Nihilo?"); - GT_LanguageManager.addStringLocalization( - "achievement.gt.blockmachines.voidminer2", - "Ores from deep below 2! Electric Boogaloo!"); + "achievement.gt.blockmachines.voidminer2", + "Ores from deep below 2! Electric Boogaloo!"); GT_LanguageManager - .addStringLocalization("achievement.gt.blockmachines.voidminer2.desc", "Ex-Nihilo, but faster!"); + .addStringLocalization("achievement.gt.blockmachines.voidminer2.desc", "Ex-Nihilo, but faster!"); GT_LanguageManager.addStringLocalization( - "achievement.gt.blockmachines.voidminer3", - "Ores from deep below 3! Trinity Ex-Nihilo"); + "achievement.gt.blockmachines.voidminer3", + "Ores from deep below 3! Trinity Ex-Nihilo"); GT_LanguageManager - .addStringLocalization("achievement.gt.blockmachines.voidminer3.desc", "3x the trouble, 3x the fun!"); + .addStringLocalization("achievement.gt.blockmachines.voidminer3.desc", "3x the trouble, 3x the fun!"); } public static void localiseAll() { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java index 9a3ade059e..d141fe8b65 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java @@ -18,8 +18,10 @@ public class RadioHatchMaterialLoader { public static void run() { for (Werkstoff material : Werkstoff.werkstoffHashSet) { - if (material != null && material.getStats().isRadioactive()) { - int level = (int) material.getStats().getProtons(); + if (material != null && material.getStats() + .isRadioactive()) { + int level = (int) material.getStats() + .getProtons(); short[] rgba = material.getRGBA(); if (material.hasItemType(OrePrefixes.stick)) BWRecipes.instance.addRadHatch(material.get(OrePrefixes.stick), level, 1, rgba); @@ -31,14 +33,14 @@ public class RadioHatchMaterialLoader { for (Materials material : Materials.getAll()) { if (material == null || material.mElement == null) continue; boolean validProton = material.getProtons() >= 83 && !material.equals(Materials.Tritanium) // No Tritanium - && !material.equals(Materials.Naquadah); // Naquadah needs spacial value + && !material.equals(Materials.Naquadah); // Naquadah needs spacial value if (validProton) { int level = (int) material.getProtons(); short[] rgba = material.getRGBA(); if (GT_OreDictUnificator.get(OrePrefixes.stick, material, 1) != null) BWRecipes.instance - .addRadHatch(GT_OreDictUnificator.get(OrePrefixes.stick, material, 1), level, 1, rgba); + .addRadHatch(GT_OreDictUnificator.get(OrePrefixes.stick, material, 1), level, 1, rgba); if (GT_OreDictUnificator.get(OrePrefixes.stickLong, material, 1) != null) BWRecipes.instance - .addRadHatch(GT_OreDictUnificator.get(OrePrefixes.stickLong, material, 1), level, 2, rgba); + .addRadHatch(GT_OreDictUnificator.get(OrePrefixes.stickLong, material, 1), level, 2, rgba); } } @@ -48,165 +50,168 @@ public class RadioHatchMaterialLoader { for (int i = 0; i < spacialMaterial.length; i++) { if (GT_OreDictUnificator.get(OrePrefixes.stick, spacialMaterial[i], 1) != null) BWRecipes.instance.addRadHatch( - GT_OreDictUnificator.get(OrePrefixes.stick, spacialMaterial[i], 1), - spacialValue[i], - 1, - spacialMaterial[i].mRGBa); + GT_OreDictUnificator.get(OrePrefixes.stick, spacialMaterial[i], 1), + spacialValue[i], + 1, + spacialMaterial[i].mRGBa); if (GT_OreDictUnificator.get(OrePrefixes.stickLong, spacialMaterial[i], 1) != null) BWRecipes.instance.addRadHatch( - GT_OreDictUnificator.get(OrePrefixes.stickLong, spacialMaterial[i], 1), - spacialValue[i], - 2, - spacialMaterial[i].mRGBa); + GT_OreDictUnificator.get(OrePrefixes.stickLong, spacialMaterial[i], 1), + spacialValue[i], + 2, + spacialMaterial[i].mRGBa); } BWRecipes.instance.addRadHatch( - ItemList.ThoriumCell_1.get(1), - (int) Materials.Thorium.getProtons(), - 3, - Materials.Thorium.mRGBa); + ItemList.ThoriumCell_1.get(1), + (int) Materials.Thorium.getProtons(), + 3, + Materials.Thorium.mRGBa); BWRecipes.instance.addRadHatch( - ItemList.ThoriumCell_2.get(1), - (int) Materials.Thorium.getProtons(), - 6, - Materials.Thorium.mRGBa); + ItemList.ThoriumCell_2.get(1), + (int) Materials.Thorium.getProtons(), + 6, + Materials.Thorium.mRGBa); BWRecipes.instance.addRadHatch( - ItemList.ThoriumCell_4.get(1), - (int) Materials.Thorium.getProtons(), - 12, - Materials.Thorium.mRGBa); + ItemList.ThoriumCell_4.get(1), + (int) Materials.Thorium.getProtons(), + 12, + Materials.Thorium.mRGBa); BWRecipes.instance.addRadHatch(ItemList.NaquadahCell_1.get(1), 140, 3, Materials.NaquadahEnriched.mRGBa); BWRecipes.instance.addRadHatch(ItemList.NaquadahCell_2.get(1), 140, 6, Materials.NaquadahEnriched.mRGBa); BWRecipes.instance.addRadHatch(ItemList.NaquadahCell_4.get(1), 140, 12, Materials.NaquadahEnriched.mRGBa); BWRecipes.instance.addRadHatch( - ItemList.Moxcell_1.get(1), - (int) Materials.Plutonium.getProtons(), - 3, - Materials.Plutonium.mRGBa); + ItemList.Moxcell_1.get(1), + (int) Materials.Plutonium.getProtons(), + 3, + Materials.Plutonium.mRGBa); BWRecipes.instance.addRadHatch( - ItemList.Moxcell_2.get(1), - (int) Materials.Plutonium.getProtons(), - 6, - Materials.Plutonium.mRGBa); + ItemList.Moxcell_2.get(1), + (int) Materials.Plutonium.getProtons(), + 6, + Materials.Plutonium.mRGBa); BWRecipes.instance.addRadHatch( - ItemList.Moxcell_4.get(1), - (int) Materials.Plutonium.getProtons(), - 12, - Materials.Plutonium.mRGBa); + ItemList.Moxcell_4.get(1), + (int) Materials.Plutonium.getProtons(), + 12, + Materials.Plutonium.mRGBa); BWRecipes.instance.addRadHatch( - ItemList.Uraniumcell_1.get(1), - (int) Materials.Uranium.getProtons(), - 3, - Materials.Uranium.mRGBa); + ItemList.Uraniumcell_1.get(1), + (int) Materials.Uranium.getProtons(), + 3, + Materials.Uranium.mRGBa); BWRecipes.instance.addRadHatch( - ItemList.Uraniumcell_2.get(1), - (int) Materials.Uranium.getProtons(), - 6, - Materials.Uranium.mRGBa); + ItemList.Uraniumcell_2.get(1), + (int) Materials.Uranium.getProtons(), + 6, + Materials.Uranium.mRGBa); BWRecipes.instance.addRadHatch( - ItemList.Uraniumcell_4.get(1), - (int) Materials.Uranium.getProtons(), - 12, - Materials.Uranium.mRGBa); + ItemList.Uraniumcell_4.get(1), + (int) Materials.Uranium.getProtons(), + 12, + Materials.Uranium.mRGBa); BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.TiberiumCell_1.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial().getProtons(), - 3, - WerkstoffLoader.Tiberium.getRGBA()); + BW_NonMeta_MaterialItems.TiberiumCell_1.get(1), + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons(), + 3, + WerkstoffLoader.Tiberium.getRGBA()); BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.TiberiumCell_2.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial().getProtons(), - 6, - WerkstoffLoader.Tiberium.getRGBA()); + BW_NonMeta_MaterialItems.TiberiumCell_2.get(1), + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons(), + 6, + WerkstoffLoader.Tiberium.getRGBA()); BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.TiberiumCell_4.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial().getProtons(), - 12, - WerkstoffLoader.Tiberium.getRGBA()); + BW_NonMeta_MaterialItems.TiberiumCell_4.get(1), + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons(), + 12, + WerkstoffLoader.Tiberium.getRGBA()); BWRecipes.instance - .addRadHatch(BW_NonMeta_MaterialItems.TheCoreCell.get(1), 140, 96, Materials.NaquadahEnriched.mRGBa); + .addRadHatch(BW_NonMeta_MaterialItems.TheCoreCell.get(1), 140, 96, Materials.NaquadahEnriched.mRGBa); BWRecipes.instance.addRadHatch( - ItemList.Depleted_Thorium_1.get(1), - (int) Materials.Thorium.getProtons() / 10, - 3, - Materials.Thorium.mRGBa); + ItemList.Depleted_Thorium_1.get(1), + (int) Materials.Thorium.getProtons() / 10, + 3, + Materials.Thorium.mRGBa); BWRecipes.instance.addRadHatch( - ItemList.Depleted_Thorium_2.get(1), - (int) Materials.Thorium.getProtons() / 10, - 6, - Materials.Thorium.mRGBa); + ItemList.Depleted_Thorium_2.get(1), + (int) Materials.Thorium.getProtons() / 10, + 6, + Materials.Thorium.mRGBa); BWRecipes.instance.addRadHatch( - ItemList.Depleted_Thorium_4.get(1), - (int) Materials.Thorium.getProtons() / 10, - 12, - Materials.Thorium.mRGBa); + ItemList.Depleted_Thorium_4.get(1), + (int) Materials.Thorium.getProtons() / 10, + 12, + Materials.Thorium.mRGBa); BWRecipes.instance - .addRadHatch(ItemList.Depleted_Naquadah_1.get(1), 140 / 10, 3, Materials.NaquadahEnriched.mRGBa); + .addRadHatch(ItemList.Depleted_Naquadah_1.get(1), 140 / 10, 3, Materials.NaquadahEnriched.mRGBa); BWRecipes.instance - .addRadHatch(ItemList.Depleted_Naquadah_2.get(1), 140 / 10, 6, Materials.NaquadahEnriched.mRGBa); + .addRadHatch(ItemList.Depleted_Naquadah_2.get(1), 140 / 10, 6, Materials.NaquadahEnriched.mRGBa); BWRecipes.instance - .addRadHatch(ItemList.Depleted_Naquadah_4.get(1), 140 / 10, 12, Materials.NaquadahEnriched.mRGBa); + .addRadHatch(ItemList.Depleted_Naquadah_4.get(1), 140 / 10, 12, Materials.NaquadahEnriched.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXSimpledepleted", 1), - (int) Materials.Plutonium.getProtons() / 10, - 3, - Materials.Plutonium.mRGBa); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXSimpledepleted", 1), + (int) Materials.Plutonium.getProtons() / 10, + 3, + Materials.Plutonium.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXDualdepleted", 1), - (int) Materials.Plutonium.getProtons() / 10, - 6, - Materials.Plutonium.mRGBa); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXDualdepleted", 1), + (int) Materials.Plutonium.getProtons() / 10, + 6, + Materials.Plutonium.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXQuaddepleted", 1), - (int) Materials.Plutonium.getProtons() / 10, - 12, - Materials.Plutonium.mRGBa); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorMOXQuaddepleted", 1), + (int) Materials.Plutonium.getProtons() / 10, + 12, + Materials.Plutonium.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumSimpledepleted", 1), - (int) Materials.Uranium.getProtons() / 10, - 3, - Materials.Uranium.mRGBa); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumSimpledepleted", 1), + (int) Materials.Uranium.getProtons() / 10, + 3, + Materials.Uranium.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumDualdepleted", 1), - (int) Materials.Uranium.getProtons() / 10, - 6, - Materials.Uranium.mRGBa); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumDualdepleted", 1), + (int) Materials.Uranium.getProtons() / 10, + 6, + Materials.Uranium.mRGBa); BWRecipes.instance.addRadHatch( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumQuaddepleted", 1), - (int) Materials.Uranium.getProtons() / 10, - 12, - Materials.Uranium.mRGBa); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "reactorUraniumQuaddepleted", 1), + (int) Materials.Uranium.getProtons() / 10, + 12, + Materials.Uranium.mRGBa); BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial().getProtons() / 10, - 3, - WerkstoffLoader.Tiberium.getRGBA()); + BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1), + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons() / 10, + 3, + WerkstoffLoader.Tiberium.getRGBA()); BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial().getProtons() / 10, - 6, - WerkstoffLoader.Tiberium.getRGBA()); + BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1), + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons() / 10, + 6, + WerkstoffLoader.Tiberium.getRGBA()); BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1), - (int) WerkstoffLoader.Tiberium.getBridgeMaterial().getProtons() / 10, - 12, - WerkstoffLoader.Tiberium.getRGBA()); + BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1), + (int) WerkstoffLoader.Tiberium.getBridgeMaterial() + .getProtons() / 10, + 12, + WerkstoffLoader.Tiberium.getRGBA()); - BWRecipes.instance.addRadHatch( - BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1), - 130 / 10, - 96, - Materials.Naquadah.mRGBa); + BWRecipes.instance + .addRadHatch(BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1), 130 / 10, 96, Materials.Naquadah.mRGBa); BWRecipes.instance.addRadHatch(ItemList.MNqCell_1.get(1), 150, 3, Materials.Naquadria.mRGBa); BWRecipes.instance.addRadHatch(ItemList.MNqCell_2.get(1), 150, 6, Materials.Naquadria.mRGBa); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java index 3adea59e54..c55561687b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java @@ -36,7 +36,7 @@ import gregtech.api.util.GT_ModHandler; public class RecipeLoader { public static final long BITSD = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE; + | GT_ModHandler.RecipeBits.REVERSIBLE; public static void run() { new Assembler().run(); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java index a44bcf57e8..6f50650484 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java @@ -69,9 +69,9 @@ public class StaticRecipeChangeLoaders { private static TObjectDoubleHashMap<Materials> gtEbfGasRecipeConsumptionMultipliers = null; public static final List<ItemStack> whitelistForEBFNoGasRecipeDontCheckItemData = Arrays - .asList(GT_ModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 12) // Raw Aluminum -> Aluminium Ingot - // (coremod) - ); + .asList(GT_ModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 12) // Raw Aluminum -> Aluminium Ingot + // (coremod) + ); private StaticRecipeChangeLoaders() {} @@ -104,15 +104,20 @@ public class StaticRecipeChangeLoaders { } public static void fixEnergyRequirements() { - RecipeMap.ALL_RECIPE_MAPS.values().stream().filter(StreamUtils::filterVisualMaps) - .forEach(recipeMap -> recipeMap.getAllRecipes().parallelStream().forEach(gt_recipe -> { - for (int i = 0; i < VN.length - 1; i++) { - if (gt_recipe.mEUt > BW_Util.getMachineVoltageFromTier(i) + RecipeMap.ALL_RECIPE_MAPS.values() + .stream() + .filter(StreamUtils::filterVisualMaps) + .forEach( + recipeMap -> recipeMap.getAllRecipes() + .parallelStream() + .forEach(gt_recipe -> { + for (int i = 0; i < VN.length - 1; i++) { + if (gt_recipe.mEUt > BW_Util.getMachineVoltageFromTier(i) && gt_recipe.mEUt <= BW_Util.getTierVoltage(i)) { - gt_recipe.mEUt = BW_Util.getMachineVoltageFromTier(i); + gt_recipe.mEUt = BW_Util.getMachineVoltageFromTier(i); + } } - } - })); + })); } public static void unificationRecipeEnforcer() { @@ -132,14 +137,13 @@ public class StaticRecipeChangeLoaders { for (ItemStack toReplace : ores) { ItemStack replacement = werkstoff.get(prefixes); if (toReplace == null || GT_Utility.areStacksEqual(toReplace, replacement) - || replacement == null - || replacement.getItem() == null) - continue; + || replacement == null + || replacement.getItem() == null) continue; for (RecipeMap<?> map : RecipeMap.ALL_RECIPE_MAPS.values()) { List<GT_Recipe> toRemove = new ArrayList<>(); nextRecipe: for (GT_Recipe recipe : map.getAllRecipes()) { boolean removal = map.equals(RecipeMaps.fluidExtractionRecipes) - || map.equals(RecipeMaps.fluidSolidifierRecipes); + || map.equals(RecipeMaps.fluidSolidifierRecipes); for (int i = 0; i < recipe.mInputs.length; i++) { if (!GT_Utility.areStacksEqual(recipe.mInputs[i], toReplace)) continue; if (removal) { @@ -155,7 +159,7 @@ public class StaticRecipeChangeLoaders { continue nextRecipe; } recipe.mOutputs[i] = GT_Utility - .copyAmount(recipe.mOutputs[i].stackSize, replacement); + .copyAmount(recipe.mOutputs[i].stackSize, replacement); } if (recipe.mSpecialItems instanceof ItemStack specialItemStack) { if (!GT_Utility.areStacksEqual(specialItemStack, toReplace)) continue; @@ -164,10 +168,11 @@ public class StaticRecipeChangeLoaders { continue nextRecipe; } recipe.mSpecialItems = GT_Utility - .copyAmount(specialItemStack.stackSize, replacement); + .copyAmount(specialItemStack.stackSize, replacement); } } - map.getBackend().removeRecipes(toRemove); + map.getBackend() + .removeRecipes(toRemove); } } } @@ -179,27 +184,28 @@ public class StaticRecipeChangeLoaders { if (werkstoff.getGenerationFeatures().enforceUnification && werkstoff.hasItemType(OrePrefixes.cellMolten)) { try { FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData( - new FluidStack(Objects.requireNonNull(molten.get(werkstoff)), 144), - werkstoff.get(OrePrefixes.cellMolten), - Materials.Empty.getCells(1)); + new FluidStack(Objects.requireNonNull(molten.get(werkstoff)), 144), + werkstoff.get(OrePrefixes.cellMolten), + Materials.Empty.getCells(1)); Field f = GT_Utility.class.getDeclaredField("sFilledContainerToData"); f.setAccessible(true); @SuppressWarnings("unchecked") Map<GT_ItemStack, FluidContainerRegistry.FluidContainerData> sFilledContainerToData = (Map<GT_ItemStack, FluidContainerRegistry.FluidContainerData>) f - .get(null); + .get(null); Set<Map.Entry<GT_ItemStack, FluidContainerRegistry.FluidContainerData>> toremFilledContainerToData = new HashSet<>(); ItemStack toReplace = null; for (Map.Entry<GT_ItemStack, FluidContainerRegistry.FluidContainerData> entry : sFilledContainerToData - .entrySet()) { + .entrySet()) { final String MODID = GameRegistry.findUniqueIdentifierFor(data.filledContainer.getItem()).modId; if (MainMod.MOD_ID.equals(MODID) || BartWorksCrossmod.MOD_ID.equals(MODID)) continue; if (entry.getValue().fluid.equals(data.fluid) - && !entry.getValue().filledContainer.equals(data.filledContainer)) { + && !entry.getValue().filledContainer.equals(data.filledContainer)) { toReplace = entry.getValue().filledContainer; toremFilledContainerToData.add(entry); } } - sFilledContainerToData.entrySet().removeAll(toremFilledContainerToData); + sFilledContainerToData.entrySet() + .removeAll(toremFilledContainerToData); Set<GT_Recipe> toremRecipeList = new HashSet<>(); if (toReplace != null) { for (RecipeMap<?> map : RecipeMap.ALL_RECIPE_MAPS.values()) { @@ -216,20 +222,21 @@ public class StaticRecipeChangeLoaders { toremRecipeList.add(recipe); // recipe.mOutputs[i] = data.filledContainer; if (map == RecipeMaps.fluidCannerRecipes - && GT_Utility.areStacksEqual(mOutput, data.filledContainer) - && !recipe.mFluidInputs[0].equals(data.fluid)) { + && GT_Utility.areStacksEqual(mOutput, data.filledContainer) + && !recipe.mFluidInputs[0].equals(data.fluid)) { toremRecipeList.add(recipe); // recipe.mOutputs[i] = data.filledContainer; } } } if (recipe.mSpecialItems instanceof ItemStack - && GT_Utility.areStacksEqual((ItemStack) recipe.mSpecialItems, toReplace)) { + && GT_Utility.areStacksEqual((ItemStack) recipe.mSpecialItems, toReplace)) { toremRecipeList.add(recipe); // recipe.mSpecialItems = data.filledContainer; } } - map.getBackend().removeRecipes(toremRecipeList); + map.getBackend() + .removeRecipes(toremRecipeList); } } GT_Utility.addFluidContainerData(data); @@ -241,7 +248,7 @@ public class StaticRecipeChangeLoaders { private static void runUnficationDeleter(Werkstoff werkstoff) { if (werkstoff.getType() == Werkstoff.Types.ELEMENT && werkstoff.getBridgeMaterial() != null - && Element.get(werkstoff.getToolTip()) != Element._NULL) { + && Element.get(werkstoff.getToolTip()) != Element._NULL) { werkstoff.getBridgeMaterial().mElement = Element.get(werkstoff.getToolTip()); Element.get(werkstoff.getToolTip()).mLinkedMaterials = new ArrayList<>(); Element.get(werkstoff.getToolTip()).mLinkedMaterials.add(werkstoff.getBridgeMaterial()); @@ -258,7 +265,7 @@ public class StaticRecipeChangeLoaders { private static void runMaterialLinker(Werkstoff werkstoff) { if (werkstoff.getType() == Werkstoff.Types.ELEMENT && werkstoff.getBridgeMaterial() != null - && Element.get(werkstoff.getToolTip()) != Element._NULL) { + && Element.get(werkstoff.getToolTip()) != Element._NULL) { werkstoff.getBridgeMaterial().mElement = Element.get(werkstoff.getToolTip()); Element.get(werkstoff.getToolTip()).mLinkedMaterials = new ArrayList<>(); Element.get(werkstoff.getToolTip()).mLinkedMaterials.add(werkstoff.getBridgeMaterial()); @@ -288,8 +295,8 @@ public class StaticRecipeChangeLoaders { for (SubTag tag : GasTags) { if (mat.contains(tag)) { DebugLog.log( - "Found EBF Recipe to change, Output:" - + BW_Util.translateGTItemStack(recipe.mOutputs[0])); + "Found EBF Recipe to change, Output:" + + BW_Util.translateGTItemStack(recipe.mOutputs[0])); toAdd.put(tag, recipe); } } @@ -314,15 +321,14 @@ public class StaticRecipeChangeLoaders { for (int i = 0; i < recipe.mInputs.length; i++) { ItemStack tmpInput = recipe.mInputs[i]; if ((recipe.mFluidInputs == null || recipe.mFluidInputs.length == 0) - && (whitelistForEBFNoGasRecipeDontCheckItemData.stream() - .anyMatch(s -> GT_Utility.areStacksEqual(s, tmpInput)) - || BW_Util.checkStackAndPrefix(recipe.mInputs[i]) - && BW_Util.checkStackAndPrefix(baseRe.mInputs[i]) - && GT_OreDictUnificator - .getAssociation(recipe.mInputs[i]).mMaterial.mMaterial.equals( - GT_OreDictUnificator.getAssociation( - baseRe.mInputs[i]).mMaterial.mMaterial) - && GT_Utility.areStacksEqual(recipe.mOutputs[0], baseRe.mOutputs[0]))) { + && (whitelistForEBFNoGasRecipeDontCheckItemData.stream() + .anyMatch(s -> GT_Utility.areStacksEqual(s, tmpInput)) + || BW_Util.checkStackAndPrefix(recipe.mInputs[i]) + && BW_Util.checkStackAndPrefix(baseRe.mInputs[i]) + && GT_OreDictUnificator.getAssociation(recipe.mInputs[i]).mMaterial.mMaterial + .equals( + GT_OreDictUnificator.getAssociation(baseRe.mInputs[i]).mMaterial.mMaterial) + && GT_Utility.areStacksEqual(recipe.mOutputs[0], baseRe.mOutputs[0]))) { toAdd.add(recipe.mOutputs[0]); repToAdd.put(tag, recipe); continue recipeLoop; @@ -349,13 +355,15 @@ public class StaticRecipeChangeLoaders { } private static int transformEBFGasRecipeTime(GT_Recipe recipe, Materials originalGas, Werkstoff newGas) { - double newEbfMul = newGas.getStats().getEbfGasRecipeTimeMultiplier(); + double newEbfMul = newGas.getStats() + .getEbfGasRecipeTimeMultiplier(); double originalEbfMul = gtEbfGasRecipeTimeMultipliers.get(originalGas); if (newEbfMul < 0.0D || originalEbfMul < 0.0D) { return transformEBFGasRecipeTime( - recipe.mDuration, - originalGas.getProtons(), - newGas.getStats().getProtons()); + recipe.mDuration, + originalGas.getProtons(), + newGas.getStats() + .getProtons()); } return Math.max(1, (int) (recipe.mDuration * newEbfMul / originalEbfMul)); } @@ -365,130 +373,126 @@ public class StaticRecipeChangeLoaders { } private static void editEBFMaterialRecipes(SubTag GasTag, GT_Recipe recipe, Materials originalGas, - HashSet<GT_Recipe> toAdd) { + HashSet<GT_Recipe> toAdd) { for (Materials newGas : Materials.values()) { if (newGas.contains(GasTag)) { int time = transformEBFGasRecipeTime(recipe, originalGas, newGas); int gasAmount = Math.max( - 1, - (int) Math.round( - recipe.mFluidInputs[0].amount * gtEbfGasRecipeConsumptionMultipliers.get(newGas))); + 1, + (int) Math.round(recipe.mFluidInputs[0].amount * gtEbfGasRecipeConsumptionMultipliers.get(newGas))); if (recipe.mFluidInputs != null && recipe.mFluidInputs.length == 1 - && recipe.mFluidInputs[0].isFluidEqual(newGas.getGas(0))) { + && recipe.mFluidInputs[0].isFluidEqual(newGas.getGas(0))) { // preserve original recipe owner toAdd.add( - new DynamicGTRecipe( - false, - recipe.mInputs, - recipe.mOutputs, - recipe.mSpecialItems, - recipe.mChances, - new FluidStack[] { newGas.getGas(gasAmount) }, - recipe.mFluidOutputs, - time, - recipe.mEUt, - recipe.mSpecialValue, - recipe)); + new DynamicGTRecipe( + false, + recipe.mInputs, + recipe.mOutputs, + recipe.mSpecialItems, + recipe.mChances, + new FluidStack[] { newGas.getGas(gasAmount) }, + recipe.mFluidOutputs, + time, + recipe.mEUt, + recipe.mSpecialValue, + recipe)); } else { // new recipe toAdd.add( - new GT_Recipe( - false, - recipe.mInputs, - recipe.mOutputs, - recipe.mSpecialItems, - recipe.mChances, - new FluidStack[] { newGas.getGas(gasAmount) }, - recipe.mFluidOutputs, - time, - recipe.mEUt, - recipe.mSpecialValue)); + new GT_Recipe( + false, + recipe.mInputs, + recipe.mOutputs, + recipe.mSpecialItems, + recipe.mChances, + new FluidStack[] { newGas.getGas(gasAmount) }, + recipe.mFluidOutputs, + time, + recipe.mEUt, + recipe.mSpecialValue)); } } } } private static void editEBFWerkstoffRecipes(SubTag GasTag, GT_Recipe recipe, Materials originalGas, - HashSet<GT_Recipe> toAdd) { + HashSet<GT_Recipe> toAdd) { for (Werkstoff newGas : Werkstoff.werkstoffHashMap.values()) { if (newGas.contains(GasTag)) { int time = transformEBFGasRecipeTime(recipe, originalGas, newGas); int gasAmount = Math.max( - 1, - (int) Math.round( - recipe.mFluidInputs[0].amount - * newGas.getStats().getEbfGasRecipeConsumedAmountMultiplier())); + 1, + (int) Math.round( + recipe.mFluidInputs[0].amount * newGas.getStats() + .getEbfGasRecipeConsumedAmountMultiplier())); if (recipe.mFluidInputs != null && recipe.mFluidInputs.length == 1 - && recipe.mFluidInputs[0] - .isFluidEqual(new FluidStack(Objects.requireNonNull(fluids.get(newGas)), 0))) { + && recipe.mFluidInputs[0] + .isFluidEqual(new FluidStack(Objects.requireNonNull(fluids.get(newGas)), 0))) { // preserve original recipe owner toAdd.add( - new DynamicGTRecipe( - false, - recipe.mInputs, - recipe.mOutputs, - recipe.mSpecialItems, - recipe.mChances, - new FluidStack[] { - new FluidStack(Objects.requireNonNull(fluids.get(newGas)), gasAmount) }, - recipe.mFluidOutputs, - time, - recipe.mEUt, - recipe.mSpecialValue, - recipe)); + new DynamicGTRecipe( + false, + recipe.mInputs, + recipe.mOutputs, + recipe.mSpecialItems, + recipe.mChances, + new FluidStack[] { new FluidStack(Objects.requireNonNull(fluids.get(newGas)), gasAmount) }, + recipe.mFluidOutputs, + time, + recipe.mEUt, + recipe.mSpecialValue, + recipe)); } else { // new recipe toAdd.add( - new GT_Recipe( - false, - recipe.mInputs, - recipe.mOutputs, - recipe.mSpecialItems, - recipe.mChances, - new FluidStack[] { - new FluidStack(Objects.requireNonNull(fluids.get(newGas)), gasAmount) }, - recipe.mFluidOutputs, - time, - recipe.mEUt, - recipe.mSpecialValue)); + new GT_Recipe( + false, + recipe.mInputs, + recipe.mOutputs, + recipe.mSpecialItems, + recipe.mChances, + new FluidStack[] { new FluidStack(Objects.requireNonNull(fluids.get(newGas)), gasAmount) }, + recipe.mFluidOutputs, + time, + recipe.mEUt, + recipe.mSpecialValue)); } } } } private static void editEBFNoGasRecipes(GT_Recipe recipe, Materials originalGas, HashSet<GT_Recipe> toAdd, - HashSet<ItemStack> noGas) { + HashSet<ItemStack> noGas) { for (ItemStack is : noGas) { byte circuitConfiguration = 1; if (GT_Utility.areStacksEqual(is, recipe.mOutputs[0])) { ArrayList<ItemStack> inputs = new ArrayList<>(recipe.mInputs.length); for (ItemStack stack : recipe.mInputs) if (!GT_Utility.areStacksEqual(GT_Utility.getIntegratedCircuit(11), stack) - && !GT_Utility.areStacksEqual(GT_Utility.getIntegratedCircuit(14), stack) - && !GT_Utility.areStacksEqual(GT_Utility.getIntegratedCircuit(19), stack)) { - if (BW_Util.checkStackAndPrefix(stack)) - circuitConfiguration = (byte) (OrePrefixes.dustSmall - .equals(GT_OreDictUnificator.getAssociation(stack).mPrefix) - ? 4 - : OrePrefixes.dustTiny.equals( - GT_OreDictUnificator.getAssociation(stack).mPrefix) ? 9 - : 1); - inputs.add(stack); - } + && !GT_Utility.areStacksEqual(GT_Utility.getIntegratedCircuit(14), stack) + && !GT_Utility.areStacksEqual(GT_Utility.getIntegratedCircuit(19), stack)) { + if (BW_Util.checkStackAndPrefix(stack)) circuitConfiguration = (byte) (OrePrefixes.dustSmall + .equals(GT_OreDictUnificator.getAssociation(stack).mPrefix) + ? 4 + : OrePrefixes.dustTiny.equals(GT_OreDictUnificator.getAssociation(stack).mPrefix) + ? 9 + : 1); + inputs.add(stack); + } inputs.add(GT_Utility.getIntegratedCircuit(circuitConfiguration)); toAdd.add( - new DynamicGTRecipe( - false, - inputs.toArray(new ItemStack[0]), - recipe.mOutputs, - recipe.mSpecialItems, - recipe.mChances, - null, - recipe.mFluidOutputs, - transformEBFNoGasRecipeTime(recipe, originalGas), - recipe.mEUt, - recipe.mSpecialValue, - recipe)); + new DynamicGTRecipe( + false, + inputs.toArray(new ItemStack[0]), + recipe.mOutputs, + recipe.mSpecialItems, + recipe.mChances, + null, + recipe.mFluidOutputs, + transformEBFNoGasRecipeTime(recipe, originalGas), + recipe.mEUt, + recipe.mSpecialValue, + recipe)); break; } } @@ -499,11 +503,10 @@ public class StaticRecipeChangeLoaders { for (GT_Recipe recipe : toAdd) { for (GT_Recipe recipe2 : toAdd) { if (recipe.mEUt != recipe2.mEUt || recipe.mDuration != recipe2.mDuration - || recipe.mSpecialValue != recipe2.mSpecialValue - || recipe == recipe2 - || recipe.mInputs.length != recipe2.mInputs.length - || recipe.mFluidInputs.length != recipe2.mFluidInputs.length) - continue; + || recipe.mSpecialValue != recipe2.mSpecialValue + || recipe == recipe2 + || recipe.mInputs.length != recipe2.mInputs.length + || recipe.mFluidInputs.length != recipe2.mFluidInputs.length) continue; boolean isSame = true; for (int i = 0; i < recipe.mInputs.length; i++) { if (!GT_Utility.areStacksEqual(recipe.mInputs[i], recipe2.mInputs[i])) isSame = false; @@ -518,7 +521,8 @@ public class StaticRecipeChangeLoaders { } private static Materials getMaterialFromInputFluid(GT_Recipe recipe) { - String materialString = recipe.mFluidInputs[0].getFluid().getName(); + String materialString = recipe.mFluidInputs[0].getFluid() + .getName(); materialString = StringUtils.removeStart(materialString, "molten"); materialString = StringUtils.removeStart(materialString, "fluid"); materialString = StringUtils.capitalize(materialString); @@ -539,7 +543,8 @@ public class StaticRecipeChangeLoaders { } } } - RecipeMaps.blastFurnaceRecipes.getBackend().removeRecipes(base.get(gasTag)); + RecipeMaps.blastFurnaceRecipes.getBackend() + .removeRecipes(base.get(gasTag)); } removeDuplicateGasRecipes(toAdd); @@ -547,18 +552,23 @@ public class StaticRecipeChangeLoaders { } public static void addElectricImplosionCompressorRecipes() { - RecipeMaps.implosionRecipes.getAllRecipes().stream().filter(e -> e.mInputs != null).forEach( + RecipeMaps.implosionRecipes.getAllRecipes() + .stream() + .filter(e -> e.mInputs != null) + .forEach( recipe -> BartWorksRecipeMaps.electricImplosionCompressorRecipes.addRecipe( - true, - Arrays.stream(recipe.mInputs).filter(e -> !StaticRecipeChangeLoaders.checkForExplosives(e)) - .distinct().toArray(ItemStack[]::new), - recipe.mOutputs, - null, - null, - null, - 1, - (int) TierEU.RECIPE_UEV, - 0)); + true, + Arrays.stream(recipe.mInputs) + .filter(e -> !StaticRecipeChangeLoaders.checkForExplosives(e)) + .distinct() + .toArray(ItemStack[]::new), + recipe.mOutputs, + null, + null, + null, + 1, + (int) TierEU.RECIPE_UEV, + 0)); // Custom EIC recipes. new ElectricImplosionCompressorRecipes().run(); @@ -566,8 +576,8 @@ public class StaticRecipeChangeLoaders { private static boolean checkForExplosives(ItemStack input) { return GT_Utility.areStacksEqual(input, new ItemStack(Blocks.tnt)) - || GT_Utility.areStacksEqual(input, GT_ModHandler.getIC2Item("industrialTnt", 1L)) - || GT_Utility.areStacksEqual(input, GT_ModHandler.getIC2Item("dynamite", 1L)) - || GT_Utility.areStacksEqual(input, ItemList.Block_Powderbarrel.get(1L)); + || GT_Utility.areStacksEqual(input, GT_ModHandler.getIC2Item("industrialTnt", 1L)) + || GT_Utility.areStacksEqual(input, GT_ModHandler.getIC2Item("dynamite", 1L)) + || GT_Utility.areStacksEqual(input, ItemList.Block_Powderbarrel.get(1L)); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java index 7a738c722c..8f152c00c7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java @@ -27,101 +27,126 @@ public class Assembler implements Runnable { @Override public void run() { Materials[] cables = { // Cable material used in the acid gen, diode and energy distributor below - Materials.Lead, // ULV - Materials.Tin, // LV - Materials.AnnealedCopper, // MV - Materials.Gold, // HV - Materials.Aluminium, // EV - Materials.Tungsten, // IV - Materials.VanadiumGallium, // LuV - Materials.Naquadah, // ZPM - Materials.NaquadahAlloy, // UV - Materials.SuperconductorUV // UHV + Materials.Lead, // ULV + Materials.Tin, // LV + Materials.AnnealedCopper, // MV + Materials.Gold, // HV + Materials.Aluminium, // EV + Materials.Tungsten, // IV + Materials.VanadiumGallium, // LuV + Materials.Naquadah, // ZPM + Materials.NaquadahAlloy, // UV + Materials.SuperconductorUV // UHV }; GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0), - Materials.Lapis.getPlates(9), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2L), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1)) - .fluidInputs(FluidRegistry.getFluidStack("ic2coolant", 1000)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .itemInputs( + new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0), + Materials.Lapis.getPlates(9), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2L), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1)) + .fluidInputs(FluidRegistry.getFluidStack("ic2coolant", 1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1), - Materials.Lapis.getBlocks(8), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[1])).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(assemblerRecipes); + .itemInputs( + new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1), + Materials.Lapis.getBlocks(8), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[1])) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1000), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(ItemRegistry.megaMachines[0]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) - .duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .itemInputs( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1000), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.megaMachines[0]) + .fluidInputs(Materials.SolderingAlloy.getMolten(9216)) + .duration(1 * HOURS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1002), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(ItemRegistry.megaMachines[1]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) - .duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .itemInputs( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1002), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.megaMachines[1]) + .fluidInputs(Materials.SolderingAlloy.getMolten(9216)) + .duration(1 * HOURS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1126), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(ItemRegistry.megaMachines[2]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) - .duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .itemInputs( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1126), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.megaMachines[2]) + .fluidInputs(Materials.SolderingAlloy.getMolten(9216)) + .duration(1 * HOURS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1169), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(ItemRegistry.megaMachines[3]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) - .duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .itemInputs( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1169), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.megaMachines[3]) + .fluidInputs(Materials.SolderingAlloy.getMolten(9216)) + .duration(1 * HOURS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1160), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(ItemRegistry.megaMachines[4]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) - .duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); + .itemInputs( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1160), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.megaMachines[4]) + .fluidInputs(Materials.SolderingAlloy.getMolten(9216)) + .duration(1 * HOURS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 64L), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[2], 1, 1)) - .fluidInputs(Materials.Plastic.getMolten(1152L)).duration(1 * TICKS).eut(TierEU.RECIPE_HV) - .addTo(assemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 64L), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[2], 1, 1)) + .fluidInputs(Materials.Plastic.getMolten(1152L)) + .duration(1 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), - Materials.Aluminium.getPlates(1), - ItemList.Circuit_Board_Plastic.get(1L), - ItemList.Battery_RE_LV_Lithium.get(1L)) - .itemOutputs(new ItemStack(ItemRegistry.CIRCUIT_PROGRAMMER)) - .fluidInputs(Materials.SolderingAlloy.getMolten(288L)).duration(30 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), + Materials.Aluminium.getPlates(1), + ItemList.Circuit_Board_Plastic.get(1L), + ItemList.Battery_RE_LV_Lithium.get(1L)) + .itemOutputs(new ItemStack(ItemRegistry.CIRCUIT_PROGRAMMER)) + .fluidInputs(Materials.SolderingAlloy.getMolten(288L)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Parts_GlassFiber.get(32), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 8), - WerkstoffLoader.CubicZirconia.get(OrePrefixes.gemExquisite, 2)) - .itemOutputs( - new ItemStack( - ItemRegistry.TecTechPipeEnergyLowPower.getItem(), - 1, - ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage())) - .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(72)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(assemblerRecipes); + .itemInputs( + ItemList.Circuit_Parts_GlassFiber.get(32), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 8), + WerkstoffLoader.CubicZirconia.get(OrePrefixes.gemExquisite, 2)) + .itemOutputs( + new ItemStack( + ItemRegistry.TecTechPipeEnergyLowPower.getItem(), + 1, + ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage())) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(72)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(assemblerRecipes); ItemStack[][] converters = ItemRegistry.TecTechLaserAdditions[0]; ItemStack[][] input = ItemRegistry.TecTechLaserAdditions[1]; @@ -132,7 +157,7 @@ public class Assembler implements Runnable { ItemList[] sensors = { ItemList.Sensor_EV, ItemList.Sensor_IV, ItemList.Sensor_LuV, ItemList.Sensor_ZPM }; OrePrefixes[] prefixes = { OrePrefixes.cableGt04, OrePrefixes.cableGt08, OrePrefixes.cableGt12, - OrePrefixes.cableGt16 }; + OrePrefixes.cableGt16 }; for (int j = 0; j < 4; j++) { for (int i = 0; i < 4; i++) { @@ -160,88 +185,110 @@ public class Assembler implements Runnable { int solderingAmount = Math.max(144 * i, 72) * (j + 1); - GT_Values.RA.stdBuilder().itemInputs( + GT_Values.RA.stdBuilder() + .itemInputs( new ItemStack( - ItemRegistry.TecTechPipeEnergyLowPower.getItem(), - ((j + 1) * 16), - ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), + ItemRegistry.TecTechPipeEnergyLowPower.getItem(), + ((j + 1) * 16), + ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), emitters[i].get(2 * (j + 1)), sensors[i].get(2 * (j + 1)), - ItemList.TRANSFORMERS[4 + i].get(2 * (j + 1))).itemOutputs(converter) - .fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) - .duration((10 * (j + 1)) * SECONDS).eut(recipeConsumption).addTo(assemblerRecipes); + ItemList.TRANSFORMERS[4 + i].get(2 * (j + 1))) + .itemOutputs(converter) + .fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) + .duration((10 * (j + 1)) * SECONDS) + .eut(recipeConsumption) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack( - ItemRegistry.TecTechPipeEnergyLowPower.getItem(), - ((j + 1) * 16), - ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), - WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), - GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), - emitters[i].get(2 * (j + 1)), - sensors[i].get(2 * (j + 1)), - ItemList.TRANSFORMERS[4 + i].get(2 * (j + 1))) - .itemOutputs(converter).fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) - .duration((10 * (j + 1)) * SECONDS).eut(recipeConsumption).addTo(assemblerRecipes); + .itemInputs( + new ItemStack( + ItemRegistry.TecTechPipeEnergyLowPower.getItem(), + ((j + 1) * 16), + ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), + WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), + GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), + emitters[i].get(2 * (j + 1)), + sensors[i].get(2 * (j + 1)), + ItemList.TRANSFORMERS[4 + i].get(2 * (j + 1))) + .itemOutputs(converter) + .fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) + .duration((10 * (j + 1)) * SECONDS) + .eut(recipeConsumption) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack( - ItemRegistry.TecTechPipeEnergyLowPower.getItem(), - (j + 1) * 16, - ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), - WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), - GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), - sensors[i].get(2 * (j + 1)), - ItemList.HATCHES_ENERGY[4 + i].get(2 * (j + 1))) - .itemOutputs(eInput).fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) - .duration((10 * (j + 1)) * SECONDS).eut(recipeConsumption).addTo(assemblerRecipes); + .itemInputs( + new ItemStack( + ItemRegistry.TecTechPipeEnergyLowPower.getItem(), + (j + 1) * 16, + ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), + WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), + GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), + sensors[i].get(2 * (j + 1)), + ItemList.HATCHES_ENERGY[4 + i].get(2 * (j + 1))) + .itemOutputs(eInput) + .fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) + .duration((10 * (j + 1)) * SECONDS) + .eut(recipeConsumption) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack( - ItemRegistry.TecTechPipeEnergyLowPower.getItem(), - (j + 1) * 16, - ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), - WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), - GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), - emitters[i].get(2 * (j + 1)), - ItemList.HATCHES_DYNAMO[4 + i].get(2 * (j + 1))) - .itemOutputs(eDynamo).fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) - .duration((10 * (j + 1) * SECONDS)).eut(recipeConsumption).addTo(assemblerRecipes); + .itemInputs( + new ItemStack( + ItemRegistry.TecTechPipeEnergyLowPower.getItem(), + (j + 1) * 16, + ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), + WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), + GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), + emitters[i].get(2 * (j + 1)), + ItemList.HATCHES_DYNAMO[4 + i].get(2 * (j + 1))) + .itemOutputs(eDynamo) + .fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) + .duration((10 * (j + 1) * SECONDS)) + .eut(recipeConsumption) + .addTo(assemblerRecipes); } } GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hatch_Input_HV.get(64), - Materials.LiquidAir.getCells(1), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(ItemRegistry.compressedHatch.copy()).duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(assemblerRecipes); + .itemInputs( + ItemList.Hatch_Input_HV.get(64), + Materials.LiquidAir.getCells(1), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.compressedHatch.copy()) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Hatch_Output_HV.get(64), GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(ItemRegistry.giantOutputHatch.copy()).duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Hatch_Output_HV.get(64), GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.giantOutputHatch.copy()) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) - .itemOutputs(new ItemStack(GregTech_API.sBlockCasings3, 1, 12)) - .fluidInputs(Materials.Concrete.getMolten(1296)).duration(2 * SECONDS).eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) + .itemOutputs(new ItemStack(GregTech_API.sBlockCasings3, 1, 12)) + .fluidInputs(Materials.Concrete.getMolten(1296)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(GregTech_API.sBlockCasings3, 1, 12), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Europium, 6), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 24)) - .itemOutputs(new ItemStack(GregTech_API.sBlockCasings8, 1, 5)) - .fluidInputs(Materials.Lead.getMolten(864)).duration(10 * SECONDS).eut(TierEU.RECIPE_LuV) - .addTo(assemblerRecipes); + .itemInputs( + new ItemStack(GregTech_API.sBlockCasings3, 1, 12), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Europium, 6), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 24)) + .itemOutputs(new ItemStack(GregTech_API.sBlockCasings8, 1, 5)) + .fluidInputs(Materials.Lead.getMolten(864)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(assemblerRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java index 61d531de0b..538195362a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java @@ -27,48 +27,59 @@ public class AssemblyLine implements Runnable { @Override public void run() { Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null - ? FluidRegistry.getFluid("molten.indalloy140") - : FluidRegistry.getFluid("molten.solderingalloy"); - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Pump_IV.get(1L)).metadata(RESEARCH_TIME, 1 * HOURS) - .itemInputs( - ItemList.Pump_IV.get(16), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 32L), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L), - ItemList.Field_Generator_LuV.get(8)) - .fluidInputs( - new FluidStack(solderIndalloy, 32 * 144), - Materials.Polytetrafluoroethylene.getMolten(32 * 144)) - .itemOutputs(ItemRegistry.dehp).eut(TierEU.RECIPE_LuV).duration(4 * MINUTES + 10 * SECONDS) - .addTo(AssemblyLine); + ? FluidRegistry.getFluid("molten.indalloy140") + : FluidRegistry.getFluid("molten.solderingalloy"); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Pump_IV.get(1L)) + .metadata(RESEARCH_TIME, 1 * HOURS) + .itemInputs( + ItemList.Pump_IV.get(16), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 32L), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L), + ItemList.Field_Generator_LuV.get(8)) + .fluidInputs( + new FluidStack(solderIndalloy, 32 * 144), + Materials.Polytetrafluoroethylene.getMolten(32 * 144)) + .itemOutputs(ItemRegistry.dehp) + .eut(TierEU.RECIPE_LuV) + .duration(4 * MINUTES + 10 * SECONDS) + .addTo(AssemblyLine); if (GalactiGreg.isModLoaded()) { - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.OreDrill4.get(1L)) - .metadata(RESEARCH_TIME, 25 * MINUTES + 36 * SECONDS) - .itemInputs( - ItemList.OreDrill4.get(1L), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 9L), - Materials.Europium.getPlates(3), - ItemList.Electric_Motor_LuV.get(9L), - ItemList.Sensor_LuV.get(9L), - ItemList.Field_Generator_LuV.get(9L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 36L)) - .fluidInputs(new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Neon.getFluidOrGas(20000)) - .itemOutputs(ItemRegistry.voidminer[0].copy()).eut(TierEU.RECIPE_LuV).duration(5 * MINUTES) - .addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.OreDrill4.get(1L)) + .metadata(RESEARCH_TIME, 25 * MINUTES + 36 * SECONDS) + .itemInputs( + ItemList.OreDrill4.get(1L), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 9L), + Materials.Europium.getPlates(3), + ItemList.Electric_Motor_LuV.get(9L), + ItemList.Sensor_LuV.get(9L), + ItemList.Field_Generator_LuV.get(9L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 36L)) + .fluidInputs(new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Neon.getFluidOrGas(20000)) + .itemOutputs(ItemRegistry.voidminer[0].copy()) + .eut(TierEU.RECIPE_LuV) + .duration(5 * MINUTES) + .addTo(AssemblyLine); } - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Machine_LuV_CircuitAssembler.get(1L)) - .metadata(RESEARCH_TIME, 20 * MINUTES) - .itemInputs( - ItemList.Machine_LuV_CircuitAssembler.get(1L), - ItemList.Robot_Arm_LuV.get(4L), - ItemList.Electric_Motor_LuV.get(4L), - ItemList.Field_Generator_LuV.get(1L), - ItemList.Emitter_LuV.get(1L), - ItemList.Sensor_LuV.get(1L), - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 8)) - .fluidInputs(new FluidStack(solderIndalloy, 1440)).itemOutputs(ItemRegistry.cal.copy()) - .eut(TierEU.RECIPE_LuV).duration(20 * MINUTES).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Machine_LuV_CircuitAssembler.get(1L)) + .metadata(RESEARCH_TIME, 20 * MINUTES) + .itemInputs( + ItemList.Machine_LuV_CircuitAssembler.get(1L), + ItemList.Robot_Arm_LuV.get(4L), + ItemList.Electric_Motor_LuV.get(4L), + ItemList.Field_Generator_LuV.get(1L), + ItemList.Emitter_LuV.get(1L), + ItemList.Sensor_LuV.get(1L), + WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 8)) + .fluidInputs(new FluidStack(solderIndalloy, 1440)) + .itemOutputs(ItemRegistry.cal.copy()) + .eut(TierEU.RECIPE_LuV) + .duration(20 * MINUTES) + .addTo(AssemblyLine); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java index 95e52fb328..1793877df3 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java @@ -20,15 +20,21 @@ public class Autoclave implements Runnable { Materials[] sterilizers = { Materials.Ammonia, Materials.Chlorine, Materials.Ethanol, Materials.Methanol }; for (Materials used : sterilizers) { - GT_Values.RA.stdBuilder().itemInputs(ItemList.Circuit_Parts_PetriDish.get(1L)) - .itemOutputs(BioItemList.getPetriDish(null)) - .fluidInputs(used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(autoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.glass_bottle)) - .itemOutputs(BioItemList.getDNASampleFlask(null)) - .fluidInputs(used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(autoclaveRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Parts_PetriDish.get(1L)) + .itemOutputs(BioItemList.getPetriDish(null)) + .fluidInputs(used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(autoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.glass_bottle)) + .itemOutputs(BioItemList.getDNASampleFlask(null)) + .fluidInputs(used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(autoclaveRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java index b8398761b4..e148376b01 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java @@ -29,88 +29,116 @@ public class Centrifuge implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(Materials.Thorium.getDust(1)) - .itemOutputs( - Materials.Thorium.getDust(1), - Materials.Thorium.getDust(1), - WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), - WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), - WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1)) - .outputChances(800, 375, 22, 22, 5).duration(8 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(centrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Thorium.getDust(1)) + .itemOutputs( + Materials.Thorium.getDust(1), + Materials.Thorium.getDust(1), + WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), + WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), + WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1)) + .outputChances(800, 375, 22, 22, 5) + .duration(8 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(centrifugeRecipes); ItemStack[] pellets = new ItemStack[6]; Arrays.fill(pellets, new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, 4)); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 3), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(pellets).duration(40 * MINUTES).eut(TierEU.RECIPE_LV).addTo(centrifugeRecipes); + .itemInputs( + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 3), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(pellets) + .duration(40 * MINUTES) + .eut(TierEU.RECIPE_LV) + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 5), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, 6)) - .duration(40 * MINUTES).eut(TierEU.RECIPE_LV).addTo(centrifugeRecipes); + .itemInputs( + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 5), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, 6)) + .duration(40 * MINUTES) + .eut(TierEU.RECIPE_LV) + .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 6)) - .itemOutputs(Materials.Lead.getDust(1)).outputChances(300).duration(60 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(centrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 6)) + .itemOutputs(Materials.Lead.getDust(1)) + .outputChances(300) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(centrifugeRecipes); int i = 0; for (GT_TileEntity_HTGR.HTGRMaterials.Fuel_ fuel : sHTGR_Fuel) { GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 3), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs( - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4)) - .duration(10 * MINUTES).eut(TierEU.RECIPE_LV).addTo(centrifugeRecipes); + .itemInputs( + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 3), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs( + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4)) + .duration(10 * MINUTES) + .eut(TierEU.RECIPE_LV) + .addTo(centrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 5), - GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 6)) - .duration(2 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_LV).addTo(centrifugeRecipes); + .itemInputs( + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 5), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 6)) + .duration(2 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(centrifugeRecipes); GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 6)) - .itemOutputs( - fuel.recycledItems[0], - fuel.recycledItems[1], - fuel.recycledItems[2], - fuel.recycledItems[3], - fuel.recycledItems[4]) - .outputChances(fuel.recycleChances); + .itemInputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 6)) + .itemOutputs( + fuel.recycledItems[0], + fuel.recycledItems[1], + fuel.recycledItems[2], + fuel.recycledItems[3], + fuel.recycledItems[4]) + .outputChances(fuel.recycleChances); if (fuel.recycledFluid != null) { recipeBuilder.fluidOutputs(fuel.recycledFluid); } - recipeBuilder.duration(1 * MINUTES).eut(TierEU.RECIPE_LV).addTo(centrifugeRecipes); + recipeBuilder.duration(1 * MINUTES) + .eut(TierEU.RECIPE_LV) + .addTo(centrifugeRecipes); i += MATERIALS_PER_FUEL; } - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(17)).itemOutputs(BioItemList.getOther(4)) - .fluidInputs(new FluidStack(BioCultureLoader.eColi.getFluid(), 1000)) - .fluidOutputs(new FluidStack(FluidLoader.BioLabFluidMaterials[1], 10)).duration(60 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(centrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(BioItemList.getOther(4)) + .fluidInputs(new FluidStack(BioCultureLoader.eColi.getFluid(), 1000)) + .fluidOutputs(new FluidStack(FluidLoader.BioLabFluidMaterials[1], 10)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(17)) - .fluidInputs(new FluidStack(FluidLoader.BioLabFluidMaterials[1], 1000)) - .fluidOutputs(new FluidStack(FluidLoader.BioLabFluidMaterials[3], 250)).duration(60 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(centrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(17)) + .fluidInputs(new FluidStack(FluidLoader.BioLabFluidMaterials[1], 1000)) + .fluidOutputs(new FluidStack(FluidLoader.BioLabFluidMaterials[3], 250)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(17)) - .fluidInputs(new FluidStack(BioCultureLoader.CommonYeast.getFluid(), 1000)) - .fluidOutputs(new FluidStack(FluidLoader.BioLabFluidMaterials[2], 10)).duration(60 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(centrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(17)) + .fluidInputs(new FluidStack(BioCultureLoader.CommonYeast.getFluid(), 1000)) + .fluidOutputs(new FluidStack(FluidLoader.BioLabFluidMaterials[2], 10)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(centrifugeRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java index 9ccc301898..f1d9ddd236 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java @@ -19,44 +19,65 @@ public class ChemicalBath implements Runnable { for (int i = 0; i < Dyes.dyeBrown.getSizeOfFluidList(); ++i) { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 6)) - .fluidInputs(Dyes.dyeRed.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) - .addTo(chemicalBathRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 7)) - .fluidInputs(Dyes.dyeGreen.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) - .addTo(chemicalBathRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 8)) - .fluidInputs(Dyes.dyePurple.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) - .addTo(chemicalBathRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 9)) - .fluidInputs(Dyes.dyeYellow.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) - .addTo(chemicalBathRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 10)) - .fluidInputs(Dyes.dyeLime.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) - .addTo(chemicalBathRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 11)) - .fluidInputs(Dyes.dyeBrown.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) - .addTo(chemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 6)) + .fluidInputs(Dyes.dyeRed.getFluidDye(i, 36)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(chemicalBathRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 7)) + .fluidInputs(Dyes.dyeGreen.getFluidDye(i, 36)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(chemicalBathRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 8)) + .fluidInputs(Dyes.dyePurple.getFluidDye(i, 36)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(chemicalBathRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 9)) + .fluidInputs(Dyes.dyeYellow.getFluidDye(i, 36)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(chemicalBathRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 10)) + .fluidInputs(Dyes.dyeLime.getFluidDye(i, 36)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(chemicalBathRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 11)) + .fluidInputs(Dyes.dyeBrown.getFluidDye(i, 36)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(chemicalBathRecipes); } for (int i = 6; i < 11; i++) { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, i)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .fluidInputs(Materials.Chlorine.getGas(50)).duration(3 * SECONDS + 4 * TICKS).eut(2) - .addTo(chemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, i)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .fluidInputs(Materials.Chlorine.getGas(50)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(chemicalBathRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java index e71a8b863f..87aaf91f71 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java @@ -17,10 +17,13 @@ public class ChemicalReactor implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)) - .fluidInputs(new FluidStack(FluidLoader.heatedfulvicAcid, 1000)) - .fluidOutputs(new FluidStack(FluidLoader.Kerogen, 1000)).duration(3 * SECONDS + 15 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(10)) + .fluidInputs(new FluidStack(FluidLoader.heatedfulvicAcid, 1000)) + .fluidOutputs(new FluidStack(FluidLoader.Kerogen, 1000)) + .duration(3 * SECONDS + 15 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java index 3ee15f52da..17a5d5b025 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java @@ -37,182 +37,171 @@ public class CraftingRecipes implements Runnable { public void run() { Materials[] cables = { // Cable material used in the acid gen, diode and energy distributor below - Materials.Lead, // ULV - Materials.Tin, // LV - Materials.AnnealedCopper, // MV - Materials.Gold, // HV - Materials.Aluminium, // EV - Materials.Tungsten, // IV - Materials.VanadiumGallium, // LuV - Materials.Naquadah, // ZPM - Materials.NaquadahAlloy, // UV - Materials.SuperconductorUV // UHV + Materials.Lead, // ULV + Materials.Tin, // LV + Materials.AnnealedCopper, // MV + Materials.Gold, // HV + Materials.Aluminium, // EV + Materials.Tungsten, // IV + Materials.VanadiumGallium, // LuV + Materials.Naquadah, // ZPM + Materials.NaquadahAlloy, // UV + Materials.SuperconductorUV // UHV }; ISubTagContainer[] hulls = { // Plate material used in the acid gen, diode and energy distributor below - Materials.WroughtIron, // ULV - Materials.Steel, // LV - Materials.Aluminium, // MV - Materials.StainlessSteel, // HV - Materials.Titanium, // EV - Materials.TungstenSteel, // IV - WerkstoffLoader.LuVTierMaterial, // LuV - Materials.Iridium, // ZPM - Materials.Osmium, // UV - Materials.Naquadah // UHV + Materials.WroughtIron, // ULV + Materials.Steel, // LV + Materials.Aluminium, // MV + Materials.StainlessSteel, // HV + Materials.Titanium, // EV + Materials.TungstenSteel, // IV + WerkstoffLoader.LuVTierMaterial, // LuV + Materials.Iridium, // ZPM + Materials.Osmium, // UV + Materials.Naquadah // UHV }; ItemStack[] bats = { ItemList.Battery_Hull_LV.get(1L), ItemList.Battery_Hull_MV.get(1L), - ItemList.Battery_Hull_HV.get(1L) }; + ItemList.Battery_Hull_HV.get(1L) }; ItemStack[] chreac = { ItemList.Machine_MV_ChemicalReactor.get(1L), ItemList.Machine_HV_ChemicalReactor.get(1L), - ItemList.Machine_EV_ChemicalReactor.get(1L) }; + ItemList.Machine_EV_ChemicalReactor.get(1L) }; GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_LESU(ConfigHandler.IDOffset, "LESU", "L.E.S.U.").getStackForm(1L), - RecipeLoader.BITSD, - new Object[] { "CDC", "SBS", "CFC", 'C', "circuitAdvanced", 'D', ItemList.Cover_Screen.get(1L), 'S', - GT_OreDictUnificator.get(OrePrefixes.cableGt12, Materials.Platinum, 1L), 'B', - new ItemStack(ItemRegistry.BW_BLOCKS[1]), 'F', ItemList.Field_Generator_HV.get(1L) }); + new GT_TileEntity_LESU(ConfigHandler.IDOffset, "LESU", "L.E.S.U.").getStackForm(1L), + RecipeLoader.BITSD, + new Object[] { "CDC", "SBS", "CFC", 'C', "circuitAdvanced", 'D', ItemList.Cover_Screen.get(1L), 'S', + GT_OreDictUnificator.get(OrePrefixes.cableGt12, Materials.Platinum, 1L), 'B', + new ItemStack(ItemRegistry.BW_BLOCKS[1]), 'F', ItemList.Field_Generator_HV.get(1L) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.DESTRUCTOPACK), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "CPC", "PLP", "CPC", 'C', "circuitAdvanced", 'P', - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 1L), 'L', - new ItemStack(Items.lava_bucket) }); + new ItemStack(ItemRegistry.DESTRUCTOPACK), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "CPC", "PLP", "CPC", 'C', "circuitAdvanced", 'P', + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Aluminium, 1L), 'L', + new ItemStack(Items.lava_bucket) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.DESTRUCTOPACK), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "CPC", "PLP", "CPC", 'C', "circuitAdvanced", 'P', - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 1L), 'L', - new ItemStack(Items.lava_bucket) }); + new ItemStack(ItemRegistry.DESTRUCTOPACK), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "CPC", "PLP", "CPC", 'C', "circuitAdvanced", 'P', + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 1L), 'L', + new ItemStack(Items.lava_bucket) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.ROCKCUTTER_MV), - RecipeLoader.BITSD, - new Object[] { "DS ", "DP ", "DCB", 'D', - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), 'S', - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1L), 'C', "circuitGood", - 'B', ItemList.IC2_AdvBattery.get(1L) }); + new ItemStack(ItemRegistry.ROCKCUTTER_MV), + RecipeLoader.BITSD, + new Object[] { "DS ", "DP ", "DCB", 'D', GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), + 'S', GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1L), 'C', "circuitGood", 'B', + ItemList.IC2_AdvBattery.get(1L) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.ROCKCUTTER_LV), - RecipeLoader.BITSD, - new Object[] { "DS ", "DP ", "DCB", 'D', - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), 'S', - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), 'C', "circuitBasic", 'B', - ItemList.IC2_ReBattery.get(1L) }); + new ItemStack(ItemRegistry.ROCKCUTTER_LV), + RecipeLoader.BITSD, + new Object[] { "DS ", "DP ", "DCB", 'D', GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), + 'S', GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), 'C', "circuitBasic", 'B', + ItemList.IC2_ReBattery.get(1L) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.ROCKCUTTER_HV), - RecipeLoader.BITSD, - new Object[] { "DS ", "DP ", "DCB", 'D', - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), 'S', - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), 'C', "circuitAdvanced", 'B', - ItemList.IC2_EnergyCrystal.get(1L) }); + new ItemStack(ItemRegistry.ROCKCUTTER_HV), + RecipeLoader.BITSD, + new Object[] { "DS ", "DP ", "DCB", 'D', GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1L), + 'S', GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L), 'C', "circuitAdvanced", 'B', + ItemList.IC2_EnergyCrystal.get(1L) }); if (ConfigHandler.teslastaff) { GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.TESLASTAFF), - RecipeLoader.BITSD, - new Object[] { "BO ", "OP ", " P", 'O', - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 1L), 'B', - ItemList.Energy_LapotronicOrb.get(1L), 'P', "plateAlloyIridium", }); + new ItemStack(ItemRegistry.TESLASTAFF), + RecipeLoader.BITSD, + new Object[] { "BO ", "OP ", " P", 'O', + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 1L), 'B', + ItemList.Energy_LapotronicOrb.get(1L), 'P', "plateAlloyIridium", }); } GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.PUMPPARTS, 1, 0), // tube - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " fG", " G ", "G ", 'G', ItemList.Circuit_Parts_Glass_Tube.get(1L) }); + new ItemStack(ItemRegistry.PUMPPARTS, 1, 0), // tube + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { " fG", " G ", "G ", 'G', ItemList.Circuit_Parts_Glass_Tube.get(1L) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.PUMPPARTS, 1, 1), // motor - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "GLP", "LSd", "PfT", 'G', - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 1L), 'L', - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 1L), 'S', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'P', - new ItemStack(Blocks.piston), 'T', new ItemStack(ItemRegistry.PUMPPARTS, 1, 0) }); + new ItemStack(ItemRegistry.PUMPPARTS, 1, 1), // motor + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "GLP", "LSd", "PfT", 'G', + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 1L), 'L', + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 1L), 'S', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L), 'P', new ItemStack(Blocks.piston), + 'T', new ItemStack(ItemRegistry.PUMPPARTS, 1, 0) }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.PUMPBLOCK, 1, 0), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "IPI", "PMP", "ISI", 'I', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Wood, 1L), 'M', - new ItemStack(ItemRegistry.PUMPPARTS, 1, 1), 'S', Ic2Items.ironFurnace }); + new ItemStack(ItemRegistry.PUMPBLOCK, 1, 0), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "IPI", "PMP", "ISI", 'I', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), + 'P', GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Wood, 1L), 'M', + new ItemStack(ItemRegistry.PUMPPARTS, 1, 1), 'S', Ic2Items.ironFurnace }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.WINDMETER), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "SWF", "Sf ", "Ss ", 'S', "stickWood", 'W', - new ItemStack(Blocks.wool, 1, Short.MAX_VALUE), 'F', new ItemStack(Items.string), }); + new ItemStack(ItemRegistry.WINDMETER), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "SWF", "Sf ", "Ss ", 'S', "stickWood", 'W', new ItemStack(Blocks.wool, 1, Short.MAX_VALUE), + 'F', new ItemStack(Items.string), }); for (int i = 0; i < 3; i++) { Materials cable = cables[i + 2]; ItemStack machinehull = ItemList.MACHINE_HULLS[i + 2].get(1L); GT_ModHandler.addCraftingRecipe( - ItemRegistry.acidGens[i], - RecipeLoader.BITSD, - new Object[] { "HRH", "HCH", "HKH", 'H', bats[i], 'K', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, cable, 1L), 'C', machinehull, 'R', - chreac[i] }); + ItemRegistry.acidGens[i], + RecipeLoader.BITSD, + new Object[] { "HRH", "HCH", "HKH", 'H', bats[i], 'K', + GT_OreDictUnificator.get(OrePrefixes.cableGt01, cable, 1L), 'C', machinehull, 'R', chreac[i] }); } GT_ModHandler.addCraftingRecipe( - ItemRegistry.acidGensLV, - RecipeLoader.BITSD, - new Object[] { "HRH", "KCK", "HKH", 'H', ItemList.Battery_Hull_LV.get(1L), 'K', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1L), 'C', - ItemList.Hull_LV.get(1L), 'R', ItemList.Machine_LV_ChemicalReactor.get(1L), }); + ItemRegistry.acidGensLV, + RecipeLoader.BITSD, + new Object[] { "HRH", "KCK", "HKH", 'H', ItemList.Battery_Hull_LV.get(1L), 'K', + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1L), 'C', ItemList.Hull_LV.get(1L), 'R', + ItemList.Machine_LV_ChemicalReactor.get(1L), }); for (int i = 0; i < 9; i++) { try { Materials cable = cables[i]; ItemStack hull = hulls[i] instanceof Materials - ? GT_OreDictUnificator.get(OrePrefixes.plate, hulls[i], 1L) - : ((Werkstoff) hulls[i]).get(OrePrefixes.plate); + ? GT_OreDictUnificator.get(OrePrefixes.plate, hulls[i], 1L) + : ((Werkstoff) hulls[i]).get(OrePrefixes.plate); ItemStack machinehull = ItemList.MACHINE_HULLS[i].get(1L); GT_ModHandler.addCraftingRecipe( - ItemRegistry.energyDistributor[i], - RecipeLoader.BITSD, - new Object[] { "PWP", "WCW", "PWP", 'W', - GT_OreDictUnificator.get(OrePrefixes.wireGt16, cable, 1L), 'P', hull, 'C', - machinehull }); + ItemRegistry.energyDistributor[i], + RecipeLoader.BITSD, + new Object[] { "PWP", "WCW", "PWP", 'W', GT_OreDictUnificator.get(OrePrefixes.wireGt16, cable, 1L), + 'P', hull, 'C', machinehull }); GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode12A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt12, cable, 1L), 'P', hull, 'C', - machinehull }); + ItemRegistry.diode12A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt12, cable, 1L), 'P', hull, 'C', machinehull }); GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode8A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt08, cable, 1L), 'P', hull, 'C', - machinehull }); + ItemRegistry.diode8A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt08, cable, 1L), 'P', hull, 'C', machinehull }); GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode4A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt04, cable, 1L), 'P', hull, 'C', - machinehull }); + ItemRegistry.diode4A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt04, cable, 1L), 'P', hull, 'C', machinehull }); GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode2A[i], - RecipeLoader.BITSD, - new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt02, cable, 1L), 'P', hull, 'C', - machinehull }); + ItemRegistry.diode2A[i], + RecipeLoader.BITSD, + new Object[] { "WDW", "DCD", "PDP", 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W', + GT_OreDictUnificator.get(OrePrefixes.cableGt02, cable, 1L), 'P', hull, 'C', machinehull }); GT_ModHandler.addCraftingRecipe( - ItemRegistry.diode16A[i], - RecipeLoader.BITSD, - new Object[] { "WHW", "DCD", "PDP", 'H', OrePrefixes.componentCircuit.get(Materials.Inductor), - 'D', OrePrefixes.componentCircuit.get(Materials.Diode), 'W', - GT_OreDictUnificator.get(OrePrefixes.wireGt16, cable, 1L), 'P', hull, 'C', - machinehull }); + ItemRegistry.diode16A[i], + RecipeLoader.BITSD, + new Object[] { "WHW", "DCD", "PDP", 'H', OrePrefixes.componentCircuit.get(Materials.Inductor), 'D', + OrePrefixes.componentCircuit.get(Materials.Diode), 'W', + GT_OreDictUnificator.get(OrePrefixes.wireGt16, cable, 1L), 'P', hull, 'C', machinehull }); } catch (ArrayIndexOutOfBoundsException ignored) { @@ -225,252 +214,245 @@ public class CraftingRecipes implements Runnable { for (String granite : granites) { for (String stone : stones) { GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "SSS", "DfD", " h ", 'S', stone, 'D', - new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "SSS", "DfD", " h ", 'S', stone, 'D', + new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hDf", "SSS", 'S', stone, 'D', - new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hDf", "SSS", 'S', stone, 'D', + new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "SSS", "DfD", " h ", 'S', stone, 'D', granite, }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "SSS", "DfD", " h ", 'S', stone, 'D', granite, }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hDf", "SSS", 'S', stone, 'D', granite, }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hDf", "SSS", 'S', stone, 'D', granite, }); } GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "STS", "h f", "SBS", 'S', granite, 'T', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), 'B', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "STS", "h f", "SBS", 'S', granite, 'T', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), + 'B', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), }); } GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_ManualTrafo( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 1, - "bw.manualtrafo", - StatCollector.translateToLocal("tile.manutrafo.name")).getStackForm(1L), - RecipeLoader.BITSD, - new Object[] { "SCS", "CHC", "ZCZ", 'S', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), 'C', - new ItemStack(ItemRegistry.BW_BLOCKS[2]), 'H', ItemList.Hull_HV.get(1L), 'Z', - "circuitAdvanced" }); + new GT_TileEntity_ManualTrafo( + ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 1, + "bw.manualtrafo", + StatCollector.translateToLocal("tile.manutrafo.name")).getStackForm(1L), + RecipeLoader.BITSD, + new Object[] { "SCS", "CHC", "ZCZ", 'S', + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L), 'C', + new ItemStack(ItemRegistry.BW_BLOCKS[2]), 'H', ItemList.Hull_HV.get(1L), 'Z', "circuitAdvanced" }); GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_Windmill( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 2, - "bw.windmill", - StatCollector.translateToLocal("tile.bw.windmill.name")).getStackForm(1L), - RecipeLoader.BITSD, - new Object[] { "BHB", "WGW", "BWB", 'B', new ItemStack(Blocks.brick_block), 'W', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), 'H', - new ItemStack(Blocks.hopper), 'G', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), }); + new GT_TileEntity_Windmill( + ConfigHandler.IDOffset + GT_Values.VN.length * 6 + 2, + "bw.windmill", + StatCollector.translateToLocal("tile.bw.windmill.name")).getStackForm(1L), + RecipeLoader.BITSD, + new Object[] { "BHB", "WGW", "BWB", 'B', new ItemStack(Blocks.brick_block), 'W', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), 'H', new ItemStack(Blocks.hopper), + 'G', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "STS", "h f", "SBS", 'S', - new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), 'T', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), 'B', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 2), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "STS", "h f", "SBS", 'S', + new ItemStack(GregTech_API.sBlockGranites, 1, OreDictionary.WILDCARD_VALUE), 'T', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 0), 'B', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 1), }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Items.leather), 'W', "logWood", }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Items.leather), 'W', "logWood", }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Blocks.carpet), 'W', "logWood", }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Blocks.carpet), 'W', "logWood", }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Items.paper), 'W', "logWood", }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WLs", "WLh", "WLf", 'L', new ItemStack(Items.paper), 'W', "logWood", }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WEs", "WZh", "WDf", 'E', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'Z', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'D', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WEs", "WZh", "WDf", 'E', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'Z', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'D', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), + 'W', "logWood", }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WEs", "WZh", "WDf", 'Z', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'E', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'D', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WEs", "WZh", "WDf", 'Z', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'E', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'D', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), + 'W', "logWood", }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WEs", "WZh", "WDf", 'D', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'Z', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'E', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WEs", "WZh", "WDf", 'D', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'Z', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'E', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), + 'W', "logWood", }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WEs", "WZh", "WDf", 'E', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'D', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'Z', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WEs", "WZh", "WDf", 'E', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'D', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'Z', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), + 'W', "logWood", }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "WEs", "WZh", "WDf", 'Z', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'D', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'E', - new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', "logWood", }); + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "WEs", "WZh", "WDf", 'Z', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'D', + new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'E', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), + 'W', "logWood", }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.LEATHER_ROTOR), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'W', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); + new ItemStack(ItemRegistry.LEATHER_ROTOR), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 3), 'W', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.WOOL_ROTOR), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'W', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); + new ItemStack(ItemRegistry.WOOL_ROTOR), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 4), 'W', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.PAPER_ROTOR), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); + new ItemStack(ItemRegistry.PAPER_ROTOR), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 5), 'W', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.COMBINED_ROTOR), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), 'W', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); + new ItemStack(ItemRegistry.COMBINED_ROTOR), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "hPf", "PWP", "sPr", 'P', new ItemStack(ItemRegistry.CRAFTING_PARTS, 1, 6), 'W', + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); GT_ModHandler.addCraftingRecipe( - new ItemStack(ItemRegistry.ROTORBLOCK), - RecipeLoader.BITSD, - new Object[] { "WRW", "RGR", "WRW", 'R', GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 1L), - 'W', "plankWood", 'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); + new ItemStack(ItemRegistry.ROTORBLOCK), + RecipeLoader.BITSD, + new Object[] { "WRW", "RGR", "WRW", 'R', GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 1L), + 'W', "plankWood", 'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iron, 1L), }); GT_ModHandler.addCraftingRecipe( - ItemRegistry.THTR, - RecipeLoader.BITSD, - new Object[] { "BZB", "BRB", "BZB", 'B', new ItemStack(GregTech_API.sBlockCasings3, 1, 12), 'R', - GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockGenerator", 1, 5), 'Z', - "circuitUltimate" }); + ItemRegistry.THTR, + RecipeLoader.BITSD, + new Object[] { "BZB", "BRB", "BZB", 'B', new ItemStack(GregTech_API.sBlockCasings3, 1, 12), 'R', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockGenerator", 1, 5), 'Z', "circuitUltimate" }); GT_ModHandler.addCraftingRecipe( - ItemRegistry.HTGR, - RecipeLoader.BITSD, - new Object[] { "BZB", "BRB", "BZB", 'B', new ItemStack(GregTech_API.sBlockCasings8, 1, 5), 'R', - GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockGenerator", 1, 5), 'Z', - "circuitSuperconductor" }); + ItemRegistry.HTGR, + RecipeLoader.BITSD, + new Object[] { "BZB", "BRB", "BZB", 'B', new ItemStack(GregTech_API.sBlockCasings8, 1, 5), 'R', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockGenerator", 1, 5), 'Z', "circuitSuperconductor" }); // DNAExtractionModule GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[0], - RecipeLoader.BITSD, - new Object[] { "TET", "CFC", "TST", 'T', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), 'E', - ItemList.Emitter_EV.get(1L), 'C', - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Aluminium, 1L), 'S', - ItemList.Sensor_EV.get(1L), 'F', ItemList.Field_Generator_EV.get(1L) }); + BioItemList.mBioLabParts[0], + RecipeLoader.BITSD, + new Object[] { "TET", "CFC", "TST", 'T', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), 'E', ItemList.Emitter_EV.get(1L), + 'C', GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Aluminium, 1L), 'S', + ItemList.Sensor_EV.get(1L), 'F', ItemList.Field_Generator_EV.get(1L) }); // PCRThermoclyclingModule GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[1], - RecipeLoader.BITSD, - new Object[] { "NEN", "CFC", "NSN", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'E', - ItemList.Emitter_EV.get(1L), 'C', - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Aluminium, 1L), 'S', - ItemList.Sensor_EV.get(1L), 'F', ItemList.Field_Generator_EV.get(1L) }); + BioItemList.mBioLabParts[1], + RecipeLoader.BITSD, + new Object[] { "NEN", "CFC", "NSN", 'N', + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'E', + ItemList.Emitter_EV.get(1L), 'C', + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Aluminium, 1L), 'S', + ItemList.Sensor_EV.get(1L), 'F', ItemList.Field_Generator_EV.get(1L) }); // PlasmidSynthesisModule GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[2], - RecipeLoader.BITSD, - new Object[] { "SFE", "CPC", "NFN", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'C', - "circuit" + Materials.Data, 'F', ItemList.Field_Generator_EV.get(1L), 'E', - ItemList.Emitter_EV.get(1L), 'S', ItemList.Sensor_EV.get(1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), }); + BioItemList.mBioLabParts[2], + RecipeLoader.BITSD, + new Object[] { "SFE", "CPC", "NFN", 'N', + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'C', "circuit" + Materials.Data, + 'F', ItemList.Field_Generator_EV.get(1L), 'E', ItemList.Emitter_EV.get(1L), 'S', + ItemList.Sensor_EV.get(1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), }); // TransformationModule GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[3], - RecipeLoader.BITSD, - new Object[] { "SFE", "CPC", "NFN", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', - "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', - ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), }); + BioItemList.mBioLabParts[3], + RecipeLoader.BITSD, + new Object[] { "SFE", "CPC", "NFN", 'N', + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', + "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', + ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', + WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), }); // ClonalCellularSynthesisModule GT_ModHandler.addCraftingRecipe( - BioItemList.mBioLabParts[4], - RecipeLoader.BITSD, - new Object[] { "FEF", "CPC", "FSF", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', - "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', - ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), }); + BioItemList.mBioLabParts[4], + RecipeLoader.BITSD, + new Object[] { "FEF", "CPC", "FSF", 'N', + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', + "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', + ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', + WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), }); GT_ModHandler.addCraftingRecipe( - new GT_TileEntity_BioVat( - ConfigHandler.IDOffset + GT_Values.VN.length * 7, - "bw.biovat", - StatCollector.translateToLocal("tile.biovat.name")).getStackForm(1L), - RecipeLoader.BITSD, - new Object[] { "GCG", "KHK", "GCG", 'G', new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), 'C', - "circuit" + Materials.Data, 'K', - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L), 'H', - ItemList.MACHINE_HULLS[3].get(1L) }); + new GT_TileEntity_BioVat( + ConfigHandler.IDOffset + GT_Values.VN.length * 7, + "bw.biovat", + StatCollector.translateToLocal("tile.biovat.name")).getStackForm(1L), + RecipeLoader.BITSD, + new Object[] { "GCG", "KHK", "GCG", 'G', new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), 'C', + "circuit" + Materials.Data, 'K', GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L), + 'H', ItemList.MACHINE_HULLS[3].get(1L) }); ItemStack[] Pistons2 = { ItemList.Electric_Piston_HV.get(1L), ItemList.Electric_Piston_EV.get(1L), - ItemList.Electric_Piston_IV.get(1L), ItemList.Electric_Piston_LuV.get(1L), - ItemList.Electric_Piston_ZPM.get(1L), ItemList.Electric_Piston_UV.get(1L) }; + ItemList.Electric_Piston_IV.get(1L), ItemList.Electric_Piston_LuV.get(1L), + ItemList.Electric_Piston_ZPM.get(1L), ItemList.Electric_Piston_UV.get(1L) }; ItemStack[] BioLab2 = new ItemStack[GT_Values.VN.length - 3]; ItemStack[] RadioHatch2 = new ItemStack[GT_Values.VN.length - 3]; Materials[] cables2 = { Materials.Gold, Materials.Aluminium, Materials.Tungsten, Materials.VanadiumGallium, - Materials.Naquadah, Materials.NaquadahAlloy, Materials.SuperconductorUHV }; + Materials.Naquadah, Materials.NaquadahAlloy, Materials.SuperconductorUHV }; Materials[] hulls2 = { Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel, Materials.Chrome, - Materials.Iridium, Materials.Osmium, Materials.Naquadah }; + Materials.Iridium, Materials.Osmium, Materials.Naquadah }; Materials[] wireMat2 = { Materials.Kanthal, Materials.Nichrome, Materials.TungstenSteel, Materials.Naquadah, - Materials.NaquadahAlloy, Materials.SuperconductorUHV }; + Materials.NaquadahAlloy, Materials.SuperconductorUHV }; Materials[] circuits2 = { Materials.Advanced, Materials.Data, Materials.Elite, Materials.Master, - Materials.Ultimate, Materials.SuperconductorUHV }; + Materials.Ultimate, Materials.SuperconductorUHV }; for (int i = 3; i < GT_Values.VN.length - 1; i++) { // 12625 BioLab2[i - 3] = new GT_MetaTileEntity_BioLab( - ConfigHandler.IDOffset + GT_Values.VN.length * 6 + i, - "bw.biolab" + GT_Values.VN[i], - GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.biolab.name"), - i).getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 6 + i, + "bw.biolab" + GT_Values.VN[i], + GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.biolab.name"), + i).getStackForm(1L); RadioHatch2[i - 3] = new GT_MetaTileEntity_RadioHatch( - ConfigHandler.IDOffset + GT_Values.VN.length * 7 - 2 + i, - "bw.radiohatch" + GT_Values.VN[i], - GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.radiohatch.name"), - i).getStackForm(1L); + ConfigHandler.IDOffset + GT_Values.VN.length * 7 - 2 + i, + "bw.radiohatch" + GT_Values.VN[i], + GT_Values.VN[i] + " " + StatCollector.translateToLocal("tile.radiohatch.name"), + i).getStackForm(1L); try { ItemStack machinehull = ItemList.MACHINE_HULLS[i].get(1L); GT_ModHandler.addCraftingRecipe( - BioLab2[i - 3], - RecipeLoader.BITSD, - new Object[] { "PFP", "WCW", "OGO", 'F', - GT_OreDictUnificator.get(OrePrefixes.frameGt, hulls2[i - 3], 1L), 'W', - GT_OreDictUnificator.get(OrePrefixes.wireGt01, wireMat2[i - 3], 1L), 'P', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', - "circuit" + circuits2[i - 3], 'C', machinehull }); + BioLab2[i - 3], + RecipeLoader.BITSD, + new Object[] { "PFP", "WCW", "OGO", 'F', + GT_OreDictUnificator.get(OrePrefixes.frameGt, hulls2[i - 3], 1L), 'W', + GT_OreDictUnificator.get(OrePrefixes.wireGt01, wireMat2[i - 3], 1L), 'P', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O', + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', + "circuit" + circuits2[i - 3], 'C', machinehull }); GT_ModHandler.addCraftingRecipe( - RadioHatch2[i - 3], - RecipeLoader.BITSD, - new Object[] { "DPD", "DCD", "DKD", 'D', - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C', machinehull, - 'K', GT_OreDictUnificator.get(OrePrefixes.cableGt08, cables2[i - 3], 1L), 'P', - Pistons2[i - 3] }); + RadioHatch2[i - 3], + RecipeLoader.BITSD, + new Object[] { "DPD", "DCD", "DKD", 'D', + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1L), 'C', machinehull, 'K', + GT_OreDictUnificator.get(OrePrefixes.cableGt08, cables2[i - 3], 1L), 'P', Pistons2[i - 3] }); } catch (ArrayIndexOutOfBoundsException ignored) { } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java index c69af8159b..9502d4eff3 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java @@ -19,106 +19,134 @@ public class Electrolyzer implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.Forsterit.get(OrePrefixes.dust, 7)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L)) - .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(10 * SECONDS).eut(90).addTo(electrolyzerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 6)) - .itemOutputs( - WerkstoffLoader.Zirconium.get(OrePrefixes.dust, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L)) - .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(12 * SECONDS + 10 * TICKS).eut(90) - .addTo(electrolyzerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.Fayalit.get(OrePrefixes.dust, 7)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L)) - .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(16 * SECONDS).eut(90).addTo(electrolyzerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.Prasiolite.get(OrePrefixes.dust, 16)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 5L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L)) - .duration(29 * SECONDS).eut(90).addTo(electrolyzerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.Hedenbergit.get(OrePrefixes.dust, 10)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 2L)) - .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(15 * SECONDS).eut(90).addTo(electrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffLoader.Forsterit.get(OrePrefixes.dust, 7)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L)) + .fluidOutputs(Materials.Oxygen.getGas(2000L)) + .duration(10 * SECONDS) + .eut(90) + .addTo(electrolyzerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 6)) + .itemOutputs( + WerkstoffLoader.Zirconium.get(OrePrefixes.dust, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L)) + .fluidOutputs(Materials.Oxygen.getGas(2000L)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(90) + .addTo(electrolyzerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffLoader.Fayalit.get(OrePrefixes.dust, 7)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L)) + .fluidOutputs(Materials.Oxygen.getGas(2000L)) + .duration(16 * SECONDS) + .eut(90) + .addTo(electrolyzerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffLoader.Prasiolite.get(OrePrefixes.dust, 16)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 5L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L)) + .duration(29 * SECONDS) + .eut(90) + .addTo(electrolyzerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffLoader.Hedenbergit.get(OrePrefixes.dust, 10)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 2L)) + .fluidOutputs(Materials.Oxygen.getGas(2000L)) + .duration(15 * SECONDS) + .eut(90) + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(WerkstoffLoader.FuchsitAL.get(OrePrefixes.dust, 21), ItemList.Cell_Empty.get(2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2)) - .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(19 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(electrolyzerRecipes); + .itemInputs(WerkstoffLoader.FuchsitAL.get(OrePrefixes.dust, 21), ItemList.Cell_Empty.get(2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2)) + .fluidOutputs(Materials.Oxygen.getGas(2000L)) + .duration(19 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(WerkstoffLoader.FuchsitCR.get(OrePrefixes.dust, 21), ItemList.Cell_Empty.get(2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2)) - .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(23 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(electrolyzerRecipes); + .itemInputs(WerkstoffLoader.FuchsitCR.get(OrePrefixes.dust, 21), ItemList.Cell_Empty.get(2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2)) + .fluidOutputs(Materials.Oxygen.getGas(2000L)) + .duration(23 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(WerkstoffLoader.VanadioOxyDravit.get(OrePrefixes.dust, 53), ItemList.Cell_Empty.get(3)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3)) - .fluidOutputs(Materials.Oxygen.getGas(19000L)).duration(35 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(electrolyzerRecipes); + .itemInputs(WerkstoffLoader.VanadioOxyDravit.get(OrePrefixes.dust, 53), ItemList.Cell_Empty.get(3)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3)) + .fluidOutputs(Materials.Oxygen.getGas(19000L)) + .duration(35 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - WerkstoffLoader.ChromoAluminoPovondrait.get(OrePrefixes.dust, 53), - ItemList.Cell_Empty.get(3)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3)) - .fluidOutputs(Materials.Oxygen.getGas(19000L)).duration(36 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(electrolyzerRecipes); + .itemInputs(WerkstoffLoader.ChromoAluminoPovondrait.get(OrePrefixes.dust, 53), ItemList.Cell_Empty.get(3)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3)) + .fluidOutputs(Materials.Oxygen.getGas(19000L)) + .duration(36 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(WerkstoffLoader.FluorBuergerit.get(OrePrefixes.dust, 50), ItemList.Cell_Empty.get(3)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 6L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 3)) - .fluidOutputs(Materials.Oxygen.getGas(6000L)).duration(36 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(electrolyzerRecipes); + .itemInputs(WerkstoffLoader.FluorBuergerit.get(OrePrefixes.dust, 50), ItemList.Cell_Empty.get(3)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 6L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 3)) + .fluidOutputs(Materials.Oxygen.getGas(6000L)) + .duration(36 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(electrolyzerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(WerkstoffLoader.Olenit.get(OrePrefixes.dust, 51), ItemList.Cell_Empty.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1)) - .fluidOutputs(Materials.Oxygen.getGas(1000L)).duration(39 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(electrolyzerRecipes); + .itemInputs(WerkstoffLoader.Olenit.get(OrePrefixes.dust, 51), ItemList.Cell_Empty.get(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1)) + .fluidOutputs(Materials.Oxygen.getGas(1000L)) + .duration(39 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(electrolyzerRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java index befa1bf05d..9b304de837 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java @@ -24,16 +24,22 @@ public class Extractor implements Runnable { if (CropLoadCore.isModLoaded() && !oreCropVine.isEmpty()) { for (ItemStack stack : oreCropVine) { - GT_Values.RA.stdBuilder().itemInputs(BW_Util.setStackSize(stack, 12)) - .itemOutputs(BioItemList.getOther(1)).duration(25 * SECONDS).eut((int) TierEU.RECIPE_HV) - .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_Util.setStackSize(stack, 12)) + .itemOutputs(BioItemList.getOther(1)) + .duration(25 * SECONDS) + .eut((int) TierEU.RECIPE_HV) + .addTo(extractorRecipes); } } - GT_Values.RA.stdBuilder().itemInputs(ItemList.Circuit_Chip_Stemcell.get(1L)) - .itemOutputs(BioItemList.getOther(4)).duration(25 * SECONDS).eut((int) TierEU.RECIPE_LuV) - .addTo(extractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Circuit_Chip_Stemcell.get(1L)) + .itemOutputs(BioItemList.getOther(4)) + .duration(25 * SECONDS) + .eut((int) TierEU.RECIPE_LuV) + .addTo(extractorRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java index 9c1d594bad..3d27c55038 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java @@ -16,9 +16,12 @@ public class FluidHeater implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)) - .fluidInputs(new FluidStack(FluidLoader.fulvicAcid, 1000)) - .fluidOutputs(new FluidStack(FluidLoader.heatedfulvicAcid, 1000)).duration(4 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(fluidHeaterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(10)) + .fluidInputs(new FluidStack(FluidLoader.fulvicAcid, 1000)) + .fluidOutputs(new FluidStack(FluidLoader.heatedfulvicAcid, 1000)) + .duration(4 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(fluidHeaterRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java index dfd92ee866..4991370f44 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java @@ -19,55 +19,85 @@ public class FluidSolidifier implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lapis_block)) - .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0)) - .fluidInputs(Materials.Iron.getMolten(1296L)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 1)) - .fluidInputs(Materials.Titanium.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 2)) - .fluidInputs(Materials.TungstenSteel.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 3)) - .fluidInputs(WerkstoffLoader.LuVTierMaterial.getMolten(1152)).duration(40 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 4)) - .fluidInputs(Materials.Iridium.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_LuV) - .addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 5)) - .fluidInputs(Materials.Osmium.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_ZPM) - .addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 13)) - .fluidInputs(Materials.Neutronium.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_UV) - .addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 14)) - .fluidInputs(Materials.CosmicNeutronium.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_UHV) - .addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 15)) - .fluidInputs(Materials.Infinity.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_UEV) - .addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[1], 1, 0)) - .fluidInputs(MaterialsUEVplus.TranscendentMetal.getMolten(1152)).duration(40 * SECONDS) - .eut(TierEU.RECIPE_UIV).addTo(fluidSolidifierRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.lapis_block)) + .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0)) + .fluidInputs(Materials.Iron.getMolten(1296L)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 1)) + .fluidInputs(Materials.Titanium.getMolten(1152)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 2)) + .fluidInputs(Materials.TungstenSteel.getMolten(1152)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 3)) + .fluidInputs(WerkstoffLoader.LuVTierMaterial.getMolten(1152)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 4)) + .fluidInputs(Materials.Iridium.getMolten(1152)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 5)) + .fluidInputs(Materials.Osmium.getMolten(1152)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 13)) + .fluidInputs(Materials.Neutronium.getMolten(1152)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_UV) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 14)) + .fluidInputs(Materials.CosmicNeutronium.getMolten(1152)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 15)) + .fluidInputs(Materials.Infinity.getMolten(1152)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_UEV) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) + .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[1], 1, 0)) + .fluidInputs(MaterialsUEVplus.TranscendentMetal.getMolten(1152)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_UIV) + .addTo(fluidSolidifierRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java index 251200649d..bdeb24af9e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java @@ -19,48 +19,58 @@ public class FormingPress implements Runnable { @Override public void run() { GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials), - Materials.Graphite.getDust(64)) - .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 1)) - .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemInputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials), Materials.Graphite.getDust(64)) + .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 1)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 1), - Materials.Silicon.getDust(64)) - .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 2)) - .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemInputs( + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 1), + Materials.Silicon.getDust(64)) + .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 2)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 2), - Materials.Graphite.getDust(64)) - .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 3)) - .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemInputs( + new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 2), + Materials.Graphite.getDust(64)) + .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 3)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); int i = 0; for (GT_TileEntity_HTGR.HTGRMaterials.Fuel_ fuel : sHTGR_Fuel) { GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i), - Materials.Carbon.getDust(64)) - .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1)) - .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemInputs( + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i), + Materials.Carbon.getDust(64)) + .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1), - Materials.Silicon.getDust(64)) - .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2)) - .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemInputs( + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1), + Materials.Silicon.getDust(64)) + .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2), - Materials.Graphite.getDust(64)) - .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 3)) - .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(formingPressRecipes); + .itemInputs( + new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2), + Materials.Graphite.getDust(64)) + .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 3)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); i += MATERIALS_PER_FUEL; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java index c37fad13d4..59c84d0f7c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java @@ -17,9 +17,12 @@ public class LaserEngraver implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.emerald), GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(BioItemList.getPlasmidCell(null)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(laserEngraverRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.emerald), GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(BioItemList.getPlasmidCell(null)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(laserEngraverRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java index 92ccdc005d..d69b4278ef 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java @@ -27,31 +27,38 @@ public class Mixer implements Runnable { @Override public void run() { GT_Values.RA.stdBuilder() - .itemInputs( - WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 10), - Materials.Uranium235.getDust(1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials)).duration(20 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(mixerRecipes); + .itemInputs( + WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 10), + Materials.Uranium235.getDust(1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(mixerRecipes); int i = 0; for (GT_TileEntity_HTGR.HTGRMaterials.Fuel_ fuel : sHTGR_Fuel) { - GT_Values.RA.stdBuilder().itemInputs(fuel.mainItem, fuel.secondaryItem, GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(mixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(fuel.mainItem, fuel.secondaryItem, GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(mixerRecipes); i += MATERIALS_PER_FUEL; } if (Gendustry.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(17), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L)) - .itemOutputs(Materials.Empty.getCells(1)) - .fluidInputs(FluidRegistry.getFluidStack("liquiddna", 1000)) - .fluidOutputs(new FluidStack(FluidLoader.BioLabFluidMaterials[0], 2000)).duration(25 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(mixerRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(17), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(FluidRegistry.getFluidStack("liquiddna", 1000)) + .fluidOutputs(new FluidStack(FluidLoader.BioLabFluidMaterials[0], 2000)) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(mixerRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java index 1f505f96a9..4dbcc45708 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java @@ -19,49 +19,79 @@ public class Pulverizer implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 1)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Titanium.getDust(8)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_EV).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 2)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.TungstenSteel.getDust(8)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_IV).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 3)) - .itemOutputs( - Materials.BorosilicateGlass.getDust(9), - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.dust, 8)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 4)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Iridium.getDust(8)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 5)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Osmium.getDust(8)).duration(40 * SECONDS) - .eut(TierEU.RECIPE_UV).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 13)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Neutronium.getDust(8)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 14)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.CosmicNeutronium.getDust(8)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_UEV).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 15)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Infinity.getDust(8)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[1], 1, 0)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), MaterialsUEVplus.TranscendentMetal.getDust(8)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_UMV).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 1)) + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Titanium.getDust(8)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 2)) + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.TungstenSteel.getDust(8)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 3)) + .itemOutputs( + Materials.BorosilicateGlass.getDust(9), + WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.dust, 8)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 4)) + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Iridium.getDust(8)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 5)) + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Osmium.getDust(8)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_UV) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 13)) + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Neutronium.getDust(8)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 14)) + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.CosmicNeutronium.getDust(8)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_UEV) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 15)) + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Infinity.getDust(8)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_UIV) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[1], 1, 0)) + .itemOutputs(Materials.BorosilicateGlass.getDust(9), MaterialsUEVplus.TranscendentMetal.getDust(8)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_UMV) + .addTo(maceratorRecipes); for (int i = 6; i < 11; i++) { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, i)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9)).duration(20 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, i)) + .itemOutputs(Materials.BorosilicateGlass.getDust(9)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(maceratorRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/PyrolyseOven.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/PyrolyseOven.java index 10a2786b8c..c810c323d9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/PyrolyseOven.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/PyrolyseOven.java @@ -13,12 +13,12 @@ public class PyrolyseOven implements Runnable { @Override public void run() { GT_Values.RA.addPyrolyseRecipe( - Materials.Wood.getDust(10), - new FluidStack(FluidLoader.Kerogen, 1000), - 10, - null, - Materials.Oil.getFluid(1000), - 105, - (int) TierEU.RECIPE_HV); + Materials.Wood.getDust(10), + new FluidStack(FluidLoader.Kerogen, 1000), + 10, + null, + Materials.Oil.getFluid(1000), + 105, + (int) TierEU.RECIPE_HV); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/BW_Network.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/BW_Network.java index e5ae3c8994..b5e002ef29 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/BW_Network.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/BW_Network.java @@ -55,56 +55,78 @@ public class BW_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet_ public BW_Network() { this.mChannel = NetworkRegistry.INSTANCE.newChannel("BartWorks", this, new BW_Network.HandlerShared()); this.mSubChannels = new GT_Packet_New[] { new RendererPacket(), new CircuitProgrammerPacket(), - new MetaBlockPacket(), new OreDictCachePacket(), new ServerJoinedPackage(), new EICPacket() }; + new MetaBlockPacket(), new OreDictCachePacket(), new ServerJoinedPackage(), new EICPacket() }; } @Override protected void encode(ChannelHandlerContext aContext, GT_Packet_New aPacket, List<Object> aOutput) - throws Exception { + throws Exception { aOutput.add( - new FMLProxyPacket( - Unpooled.buffer().writeByte(aPacket.getPacketID()).writeBytes(aPacket.encode()).copy(), - aContext.channel().attr(NetworkRegistry.FML_CHANNEL).get())); + new FMLProxyPacket( + Unpooled.buffer() + .writeByte(aPacket.getPacketID()) + .writeBytes(aPacket.encode()) + .copy(), + aContext.channel() + .attr(NetworkRegistry.FML_CHANNEL) + .get())); } @Override protected void decode(ChannelHandlerContext aContext, FMLProxyPacket aPacket, List<Object> aOutput) - throws Exception { - ByteArrayDataInput aData = ByteStreams.newDataInput(aPacket.payload().array()); + throws Exception { + ByteArrayDataInput aData = ByteStreams.newDataInput( + aPacket.payload() + .array()); aOutput.add(this.mSubChannels[aData.readByte()].decode(aData)); } @Override public void sendToPlayer(@Nonnull GT_Packet aPacket, @Nonnull EntityPlayerMP aPlayer) { - this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) - .set(FMLOutboundHandler.OutboundTarget.PLAYER); - this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPlayer); - this.mChannel.get(Side.SERVER).writeAndFlush(aPacket); + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.PLAYER); + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) + .set(aPlayer); + this.mChannel.get(Side.SERVER) + .writeAndFlush(aPacket); } public void sendToAllPlayersinWorld(@Nonnull GT_Packet aPacket, World world) { - for (String name : FMLServerHandler.instance().getServer().getAllUsernames()) { - this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) - .set(FMLOutboundHandler.OutboundTarget.PLAYER); - this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) - .set(world.getPlayerEntityByName(name)); - this.mChannel.get(Side.SERVER).writeAndFlush(aPacket); + for (String name : FMLServerHandler.instance() + .getServer() + .getAllUsernames()) { + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.PLAYER); + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) + .set(world.getPlayerEntityByName(name)); + this.mChannel.get(Side.SERVER) + .writeAndFlush(aPacket); } } @Override public void sendToAllAround(@Nonnull GT_Packet aPacket, NetworkRegistry.TargetPoint aPosition) { - this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) - .set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); - this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPosition); - this.mChannel.get(Side.SERVER).writeAndFlush(aPacket); + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) + .set(aPosition); + this.mChannel.get(Side.SERVER) + .writeAndFlush(aPacket); } @Override public void sendToServer(@Nonnull GT_Packet aPacket) { - this.mChannel.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET) - .set(FMLOutboundHandler.OutboundTarget.TOSERVER); - this.mChannel.get(Side.CLIENT).writeAndFlush(aPacket); + this.mChannel.get(Side.CLIENT) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.TOSERVER); + this.mChannel.get(Side.CLIENT) + .writeAndFlush(aPacket); } @Override @@ -117,8 +139,9 @@ public class BW_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet_ } Chunk tChunk = aWorld.getChunkFromBlockCoords(aX, aZ); - if (tPlayer.getServerForPlayer().getPlayerManager() - .isPlayerWatchingChunk(tPlayer, tChunk.xPosition, tChunk.zPosition)) { + if (tPlayer.getServerForPlayer() + .getPlayerManager() + .isPlayerWatchingChunk(tPlayer, tChunk.xPosition, tChunk.zPosition)) { this.sendToPlayer(aPacket, tPlayer); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/CircuitProgrammerPacket.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/CircuitProgrammerPacket.java index 0ab6e42e91..c47b834157 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/CircuitProgrammerPacket.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/CircuitProgrammerPacket.java @@ -52,16 +52,18 @@ public class CircuitProgrammerPacket extends GT_Packet_New { @Override public void encode(ByteBuf aOut) { - aOut.writeInt(this.dimID).writeInt(this.playerID).writeByte(this.hasChip ? this.chipCfg : -1); + aOut.writeInt(this.dimID) + .writeInt(this.playerID) + .writeByte(this.hasChip ? this.chipCfg : -1); } @Override public GT_Packet_New decode(ByteArrayDataInput byteArrayDataInput) { return new CircuitProgrammerPacket( - byteArrayDataInput.readInt(), - byteArrayDataInput.readInt(), - byteArrayDataInput.readByte() > -1, - byteArrayDataInput.readByte()); + byteArrayDataInput.readInt(), + byteArrayDataInput.readInt(), + byteArrayDataInput.readByte() > -1, + byteArrayDataInput.readByte()); } @Override @@ -77,8 +79,8 @@ public class CircuitProgrammerPacket extends GT_Packet_New { if (this.hasChip) nbt.setByte("ChipConfig", this.chipCfg); stack.setTagCompound(nbt); ((EntityPlayer) w.getEntityByID(this.playerID)).inventory.setInventorySlotContents( - ((EntityPlayer) w.getEntityByID(this.playerID)).inventory.currentItem, - stack); + ((EntityPlayer) w.getEntityByID(this.playerID)).inventory.currentItem, + stack); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/MetaBlockPacket.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/MetaBlockPacket.java index 631021a299..6b555014ed 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/MetaBlockPacket.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/MetaBlockPacket.java @@ -54,11 +54,20 @@ public class MetaBlockPacket extends GT_Packet_New { @Override public void encode(ByteBuf aOut) { int hash = MurmurHash3.murmurhash3_x86_32( - ByteBuffer.allocate(12).putInt(this.x).putInt(this.z).putShort(this.y).putShort(this.meta).array(), - 0, - 12, - 31); - aOut.writeInt(this.x).writeInt(this.z).writeShort(this.y).writeShort(this.meta).writeInt(hash); + ByteBuffer.allocate(12) + .putInt(this.x) + .putInt(this.z) + .putShort(this.y) + .putShort(this.meta) + .array(), + 0, + 12, + 31); + aOut.writeInt(this.x) + .writeInt(this.z) + .writeShort(this.y) + .writeShort(this.meta) + .writeInt(hash); } @Override @@ -69,10 +78,15 @@ public class MetaBlockPacket extends GT_Packet_New { this.meta = byteArrayDataInput.readShort(); MetaBlockPacket todecode = new MetaBlockPacket(this.x, this.y, this.z, this.meta); if (byteArrayDataInput.readInt() != MurmurHash3.murmurhash3_x86_32( - ByteBuffer.allocate(12).putInt(this.x).putInt(this.z).putShort(this.y).putShort(this.meta).array(), - 0, - 12, - 31)) { + ByteBuffer.allocate(12) + .putInt(this.x) + .putInt(this.z) + .putShort(this.y) + .putShort(this.meta) + .array(), + 0, + 12, + 31)) { MainMod.LOGGER.error("PACKET HASH DOES NOT MATCH!"); return null; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/OreDictCachePacket.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/OreDictCachePacket.java index 3ae70af18b..c488273d73 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/OreDictCachePacket.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/OreDictCachePacket.java @@ -47,7 +47,8 @@ public class OreDictCachePacket extends GT_Packet_New { int size = this.hashSet.size(); aOut.writeInt(size); for (Pair<Integer, Short> p : this.hashSet) { - aOut.writeInt(p.getKey()).writeShort(p.getValue()); + aOut.writeInt(p.getKey()) + .writeShort(p.getValue()); } } @@ -62,7 +63,9 @@ public class OreDictCachePacket extends GT_Packet_New { @Override public void process(IBlockAccess iBlockAccess) { - OreDictHandler.getNonBWCache().clear(); - OreDictHandler.getNonBWCache().addAll(this.hashSet); + OreDictHandler.getNonBWCache() + .clear(); + OreDictHandler.getNonBWCache() + .addAll(this.hashSet); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/RendererPacket.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/RendererPacket.java index b1bb0a0dd8..436413fa14 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/RendererPacket.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/RendererPacket.java @@ -53,26 +53,33 @@ public class RendererPacket extends GT_Packet_New { byte g = (byte) (this.integer >> 8 & 0xFF); byte b = (byte) (this.integer & 0xFF); byte checksum = (byte) (this.coords.x % 25 + this.coords.y % 25 - + this.coords.z % 25 - + this.coords.wID % 25 - + this.integer % 25 - + this.removal); - aOut.writeInt(this.coords.x).writeShort(this.coords.y).writeInt(this.coords.z).writeInt(this.coords.wID) - .writeByte(r).writeByte(g).writeByte(b).writeByte(this.removal).writeByte(checksum); + + this.coords.z % 25 + + this.coords.wID % 25 + + this.integer % 25 + + this.removal); + aOut.writeInt(this.coords.x) + .writeShort(this.coords.y) + .writeInt(this.coords.z) + .writeInt(this.coords.wID) + .writeByte(r) + .writeByte(g) + .writeByte(b) + .writeByte(this.removal) + .writeByte(checksum); } @Override public GT_Packet_New decode(ByteArrayDataInput dataInput) { this.coords = new Coords(dataInput.readInt(), dataInput.readShort(), dataInput.readInt(), dataInput.readInt()); this.integer = BW_ColorUtil - .getColorFromRGBArray(new int[] { dataInput.readByte(), dataInput.readByte(), dataInput.readByte() }); + .getColorFromRGBArray(new int[] { dataInput.readByte(), dataInput.readByte(), dataInput.readByte() }); this.removal = dataInput.readByte(); byte checksum = (byte) (this.coords.x % 25 + this.coords.y % 25 - + this.coords.z % 25 - + this.coords.wID % 25 - + this.integer % 25 - + this.removal); + + this.coords.z % 25 + + this.coords.wID % 25 + + this.integer % 25 + + this.removal); if (checksum != dataInput.readByte()) { MainMod.LOGGER.error("BW Packet was corrupted or modified!"); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/ServerJoinedPackage.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/ServerJoinedPackage.java index 3a6734d568..091802683d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/net/ServerJoinedPackage.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/net/ServerJoinedPackage.java @@ -33,7 +33,7 @@ public class ServerJoinedPackage extends GT_Packet_New { public ServerJoinedPackage(Object obj) { super(false); this.config = (byte) (ConfigHandler.classicMode && ConfigHandler.disableExtraGassesForEBF ? 3 - : ConfigHandler.classicMode ? 2 : ConfigHandler.disableExtraGassesForEBF ? 1 : 0); + : ConfigHandler.classicMode ? 2 : ConfigHandler.disableExtraGassesForEBF ? 1 : 0); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_ExperimentalFloodGate.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_ExperimentalFloodGate.java index 9d6c03be7d..79bedfa1b8 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_ExperimentalFloodGate.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_ExperimentalFloodGate.java @@ -98,10 +98,16 @@ public class BW_TileEntity_ExperimentalFloodGate extends TileFluidHandler implem private void setFluidBlock(Coords current) { if (!this.checkForAir(current) || this.tank.drain(1000, false) == null - || this.tank.drain(1000, false).amount != 1000) - return; + || this.tank.drain(1000, false).amount != 1000) return; FluidStack stack = this.tank.drain(1000, true); - this.worldObj.setBlock(current.x, current.y, current.z, stack.getFluid().getBlock(), 0, 2); + this.worldObj.setBlock( + current.x, + current.y, + current.z, + stack.getFluid() + .getBlock(), + 0, + 2); } private void addBlockToQueue(Coords current, ForgeDirection allowed_direction) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java index 98932b8d72..faccfc4738 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java @@ -52,7 +52,7 @@ import gregtech.api.util.GT_Utility; import gregtech.common.GT_Pollution; public class BW_TileEntity_HeatedWaterPump extends TileEntity implements ITileDropsContent, IFluidHandler, IFluidTank, - ITileWithModularUI, ITileAddsInformation, ITileHasDifferentTextureSides { + ITileWithModularUI, ITileAddsInformation, ITileHasDifferentTextureSides { public static final int FUELSLOT = 0; public static final Fluid WATER = FluidRegistry.WATER; @@ -85,7 +85,8 @@ public class BW_TileEntity_HeatedWaterPump extends TileEntity implements ITileDr this.fuel = compound.getInteger("fuel"); this.maxfuel = compound.getInteger("maxfuel"); this.outputstack = FluidStack.loadFluidStackFromNBT(compound.getCompoundTag("FluidStack")); - if (!compound.getCompoundTag("ItemStack").equals(new NBTTagCompound())) + if (!compound.getCompoundTag("ItemStack") + .equals(new NBTTagCompound())) this.fuelstack = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("ItemStack")); super.readFromNBT(compound); } @@ -134,38 +135,40 @@ public class BW_TileEntity_HeatedWaterPump extends TileEntity implements ITileDr private void pushWaterToAdjacentTiles() { Arrays.stream(ForgeDirection.values(), 0, 6) // All but Unknown - .forEach( - direction -> Optional.ofNullable( - this.worldObj.getTileEntity( - this.xCoord + direction.offsetX, - this.yCoord + direction.offsetY, - this.zCoord + direction.offsetZ)) - .ifPresent(te -> { - if (te instanceof IFluidHandler tank) { - if (tank.canFill(direction.getOpposite(), this.outputstack.getFluid())) { - int drainage = tank.fill(direction.getOpposite(), this.outputstack, false); - if (drainage > 0) { - tank.fill(direction.getOpposite(), this.outputstack, true); - this.drain(drainage, true); - } - } - } else if (te instanceof IFluidTank tank) { - int drainage = tank.fill(this.outputstack, false); - if (drainage > 0) { - tank.fill(this.outputstack, true); - this.drain(drainage, true); - } - } - })); + .forEach( + direction -> Optional + .ofNullable( + this.worldObj.getTileEntity( + this.xCoord + direction.offsetX, + this.yCoord + direction.offsetY, + this.zCoord + direction.offsetZ)) + .ifPresent(te -> { + if (te instanceof IFluidHandler tank) { + if (tank.canFill(direction.getOpposite(), this.outputstack.getFluid())) { + int drainage = tank.fill(direction.getOpposite(), this.outputstack, false); + if (drainage > 0) { + tank.fill(direction.getOpposite(), this.outputstack, true); + this.drain(drainage, true); + } + } + } else if (te instanceof IFluidTank tank) { + int drainage = tank.fill(this.outputstack, false); + if (drainage > 0) { + tank.fill(this.outputstack, true); + this.drain(drainage, true); + } + } + })); } private void causePollution() { - Optional.ofNullable(this.worldObj).ifPresent(e -> { - if (e.getTotalWorldTime() % 20 == 0) { - Optional.ofNullable(e.getChunkFromBlockCoords(this.xCoord, this.zCoord)) + Optional.ofNullable(this.worldObj) + .ifPresent(e -> { + if (e.getTotalWorldTime() % 20 == 0) { + Optional.ofNullable(e.getChunkFromBlockCoords(this.xCoord, this.zCoord)) .ifPresent(c -> GT_Pollution.addPollution(c, ConfigHandler.pollutionHeatedWaterPumpSecond)); - } - }); + } + }); } @Override @@ -197,8 +200,7 @@ public class BW_TileEntity_HeatedWaterPump extends TileEntity implements ITileDr @Override public ItemStack decrStackSize(int slot, int ammount) { if (slot != BW_TileEntity_HeatedWaterPump.FUELSLOT || this.fuelstack == null - || ammount > this.fuelstack.stackSize) - return null; + || ammount > this.fuelstack.stackSize) return null; return this.fuelstack.splitStack(ammount); } @@ -279,14 +281,14 @@ public class BW_TileEntity_HeatedWaterPump extends TileEntity implements ITileDr if (doDrain) { this.outputstack.amount -= actualdrain; FluidEvent.fireEvent( - new FluidEvent.FluidDrainingEvent( - this.outputstack, - this.getWorldObj(), - this.xCoord, - this.yCoord, - this.zCoord, - this, - actualdrain)); + new FluidEvent.FluidDrainingEvent( + this.outputstack, + this.getWorldObj(), + this.xCoord, + this.yCoord, + this.zCoord, + this, + actualdrain)); } return ret; } @@ -299,8 +301,7 @@ public class BW_TileEntity_HeatedWaterPump extends TileEntity implements ITileDr @Override public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { if (resource != null && resource.getFluid() == BW_TileEntity_HeatedWaterPump.WATER - && this.drain(resource.amount, false) != null) - return this.drain(resource.amount, doDrain); + && this.drain(resource.amount, false) != null) return this.drain(resource.amount, doDrain); return null; } @@ -327,23 +328,23 @@ public class BW_TileEntity_HeatedWaterPump extends TileEntity implements ITileDr @Override public String[] getInfoData() { return new String[] { - StatCollector.translateToLocal("tooltip.tile.waterpump.0.name") + " " - + GT_Utility.formatNumbers(ConfigHandler.mbWaterperSec) - + String.format( - StatCollector.translateToLocal("tooltip.tile.waterpump.1.name"), - ConfigHandler.pollutionHeatedWaterPumpSecond), - StatCollector.translateToLocal("tooltip.tile.waterpump.2.name") }; + StatCollector.translateToLocal("tooltip.tile.waterpump.0.name") + " " + + GT_Utility.formatNumbers(ConfigHandler.mbWaterperSec) + + String.format( + StatCollector.translateToLocal("tooltip.tile.waterpump.1.name"), + ConfigHandler.pollutionHeatedWaterPumpSecond), + StatCollector.translateToLocal("tooltip.tile.waterpump.2.name") }; } @Override public void registerBlockIcons(IIconRegister par1IconRegister) { ITileHasDifferentTextureSides.texture[ForgeDirection.UP.ordinal()] = par1IconRegister - .registerIcon(MainMod.MOD_ID + ":heatedWaterPumpTop"); + .registerIcon(MainMod.MOD_ID + ":heatedWaterPumpTop"); ITileHasDifferentTextureSides.texture[ForgeDirection.DOWN.ordinal()] = par1IconRegister - .registerIcon(MainMod.MOD_ID + ":heatedWaterPumpDown"); + .registerIcon(MainMod.MOD_ID + ":heatedWaterPumpDown"); for (int i = 2; i < 7; i++) { ITileHasDifferentTextureSides.texture[i] = par1IconRegister - .registerIcon(MainMod.MOD_ID + ":heatedWaterPumpSide"); + .registerIcon(MainMod.MOD_ID + ":heatedWaterPumpSide"); } } @@ -355,12 +356,18 @@ public class BW_TileEntity_HeatedWaterPump extends TileEntity implements ITileDr final IItemHandlerModifiable invWrapper = new InvWrapper(this); builder.widget( - new SlotWidget(invWrapper, 0).setFilter(stack -> TileEntityFurnace.getItemBurnTime(stack) > 0) - .setPos(55, 52)) - .widget(SlotWidget.phantom(invWrapper, 1).disableInteraction().setPos(85, 32)).widget( - new ProgressBar().setProgress(() -> (float) this.fuel / this.maxfuel) - .setTexture(BW_UITextures.PROGRESSBAR_FUEL, 14).setDirection(ProgressBar.Direction.UP) - .setPos(56, 36).setSize(14, 14)); + new SlotWidget(invWrapper, 0).setFilter(stack -> TileEntityFurnace.getItemBurnTime(stack) > 0) + .setPos(55, 52)) + .widget( + SlotWidget.phantom(invWrapper, 1) + .disableInteraction() + .setPos(85, 32)) + .widget( + new ProgressBar().setProgress(() -> (float) this.fuel / this.maxfuel) + .setTexture(BW_UITextures.PROGRESSBAR_FUEL, 14) + .setDirection(ProgressBar.Direction.UP) + .setPos(56, 36) + .setSize(14, 14)); return builder.build(); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_InfinityTank.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_InfinityTank.java index d91b790596..0dc888c663 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_InfinityTank.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_InfinityTank.java @@ -93,7 +93,10 @@ public class BW_TileEntity_InfinityTank extends TileEntity implements IFluidTank for (FluidStack internaltank : this.INTERNALTANKS) { if (internaltank != null) { NBTTagCompound entry = new NBTTagCompound(); - entry.setString("FluidName", internaltank.getFluid().getName()); + entry.setString( + "FluidName", + internaltank.getFluid() + .getName()); entry.setInteger("Ammount", internaltank.amount); entry.setTag("FluidTag", internaltank.tag); lInternalTank.appendTag(entry); @@ -146,14 +149,14 @@ public class BW_TileEntity_InfinityTank extends TileEntity implements IFluidTank if (doDrain) { outputstack.amount -= actualdrain; FluidEvent.fireEvent( - new FluidEvent.FluidDrainingEvent( - outputstack, - this.getWorldObj(), - this.xCoord, - this.yCoord, - this.zCoord, - this, - actualdrain)); + new FluidEvent.FluidDrainingEvent( + outputstack, + this.getWorldObj(), + this.xCoord, + this.yCoord, + this.zCoord, + this, + actualdrain)); } return ret; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java index fa2f7e9590..a7d8ea9db8 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java @@ -116,28 +116,27 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa private static final int CASING_INDEX = 49; private static final String STRUCTURE_PIECE_MAIN = "main"; private static final IStructureDefinition<GT_TileEntity_BioVat> STRUCTURE_DEFINITION = StructureDefinition - .<GT_TileEntity_BioVat>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "ccccc", "ccccc", "ccccc", "ccccc", "ccccc" }, - { "ggggg", "gaaag", "gaaag", "gaaag", "ggggg" }, - { "ggggg", "gaaag", "gaaag", "gaaag", "ggggg" }, - { "cc~cc", "ccccc", "ccccc", "ccccc", "ccccc" }, })) - .addElement( - 'c', - ofChain( - ofHatchAdder(GT_TileEntity_BioVat::addMaintenanceToMachineList, CASING_INDEX, 1), - ofHatchAdder(GT_TileEntity_BioVat::addOutputToMachineList, CASING_INDEX, 1), - ofHatchAdder(GT_TileEntity_BioVat::addInputToMachineList, CASING_INDEX, 1), - ofHatchAdder(GT_TileEntity_BioVat::addRadiationInputToMachineList, CASING_INDEX, 1), - ofHatchAdder(GT_TileEntity_BioVat::addEnergyInputToMachineList, CASING_INDEX, 1), - onElementPass(e -> e.mCasing++, ofBlock(GregTech_API.sBlockCasings4, 1)))) - .addElement('a', ofChain(isAir(), ofBlockAnyMeta(FluidLoader.bioFluidBlock))) - .addElement( - 'g', - ofGlassTiered((byte) 1, (byte) 127, (byte) 0, (te, v) -> te.mGlassTier = v, te -> te.mGlassTier, 1)) - .build(); + .<GT_TileEntity_BioVat>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { { "ccccc", "ccccc", "ccccc", "ccccc", "ccccc" }, + { "ggggg", "gaaag", "gaaag", "gaaag", "ggggg" }, { "ggggg", "gaaag", "gaaag", "gaaag", "ggggg" }, + { "cc~cc", "ccccc", "ccccc", "ccccc", "ccccc" }, })) + .addElement( + 'c', + ofChain( + ofHatchAdder(GT_TileEntity_BioVat::addMaintenanceToMachineList, CASING_INDEX, 1), + ofHatchAdder(GT_TileEntity_BioVat::addOutputToMachineList, CASING_INDEX, 1), + ofHatchAdder(GT_TileEntity_BioVat::addInputToMachineList, CASING_INDEX, 1), + ofHatchAdder(GT_TileEntity_BioVat::addRadiationInputToMachineList, CASING_INDEX, 1), + ofHatchAdder(GT_TileEntity_BioVat::addEnergyInputToMachineList, CASING_INDEX, 1), + onElementPass(e -> e.mCasing++, ofBlock(GregTech_API.sBlockCasings4, 1)))) + .addElement('a', ofChain(isAir(), ofBlockAnyMeta(FluidLoader.bioFluidBlock))) + .addElement( + 'g', + ofGlassTiered((byte) 1, (byte) 127, (byte) 0, (te, v) -> te.mGlassTier = v, te -> te.mGlassTier, 1)) + .build(); @Override public IStructureDefinition<GT_TileEntity_BioVat> getStructureDefinition() { @@ -152,16 +151,24 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Bacterial Vat").addInfo("Controller block for the Bacterial Vat") - .addInfo("For maximum efficiency boost keep the Output Hatch always half filled!").addSeparator() - .beginStructureBlock(5, 4, 5, false).addController("Front bottom center") - .addCasingInfoMin("Clean Stainless Steel Casings", 19, false) - .addOtherStructurePart("Glass", "Hollow two middle layers", 2) - .addStructureInfo("The glass can be any glass, i.e. Tinkers Construct Clear Glass") - .addStructureInfo("Some Recipes need more advanced Glass Types").addMaintenanceHatch("Any casing", 1) - .addOtherStructurePart("Radio Hatch", "Any casing", 1).addInputBus("Any casing", 1) - .addOutputBus("Any casing", 1).addInputHatch("Any casing", 1).addOutputHatch("Any casing", 1) - .addEnergyHatch("Any casing", 1).toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + tt.addMachineType("Bacterial Vat") + .addInfo("Controller block for the Bacterial Vat") + .addInfo("For maximum efficiency boost keep the Output Hatch always half filled!") + .addSeparator() + .beginStructureBlock(5, 4, 5, false) + .addController("Front bottom center") + .addCasingInfoMin("Clean Stainless Steel Casings", 19, false) + .addOtherStructurePart("Glass", "Hollow two middle layers", 2) + .addStructureInfo("The glass can be any glass, i.e. Tinkers Construct Clear Glass") + .addStructureInfo("Some Recipes need more advanced Glass Types") + .addMaintenanceHatch("Any casing", 1) + .addOtherStructurePart("Radio Hatch", "Any casing", 1) + .addInputBus("Any casing", 1) + .addOutputBus("Any casing", 1) + .addInputHatch("Any casing", 1) + .addOutputHatch("Any casing", 1) + .addEnergyHatch("Any casing", 1) + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); return tt; } @@ -175,11 +182,15 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa } private int getInputCapacity() { - return this.mInputHatches.stream().mapToInt(GT_MetaTileEntity_Hatch_Input::getCapacity).sum(); + return this.mInputHatches.stream() + .mapToInt(GT_MetaTileEntity_Hatch_Input::getCapacity) + .sum(); } private int getOutputCapacity() { - return this.mOutputHatches.stream().mapToInt(GT_MetaTileEntity_Hatch_Output::getCapacity).sum(); + return this.mOutputHatches.stream() + .mapToInt(GT_MetaTileEntity_Hatch_Output::getCapacity) + .sum(); } @Override @@ -236,9 +247,8 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa @Override protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { if (!BW_Util.areStacksEqualOrNull( - (ItemStack) recipe.mSpecialItems, - GT_TileEntity_BioVat.this.getControllerSlot())) - return CheckRecipeResultRegistry.NO_RECIPE; + (ItemStack) recipe.mSpecialItems, + GT_TileEntity_BioVat.this.getControllerSlot())) return CheckRecipeResultRegistry.NO_RECIPE; int[] conditions = GT_TileEntity_BioVat.specialValueUnpack(recipe.mSpecialValue); GT_TileEntity_BioVat.this.mNeededSievert = conditions[3]; @@ -294,7 +304,8 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa public FluidStack getStoredFluidOutputs() { // Only one output Hatch assert this.mOutputHatches.size() == 1; - return this.mOutputHatches.get(0).getFluid(); + return this.mOutputHatches.get(0) + .getFluid(); } private boolean addRadiationInputToMachineList(IGregTechTileEntity aTileEntity, int CasingIndex) { @@ -319,10 +330,10 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa if (!this.checkPiece(STRUCTURE_PIECE_MAIN, 2, 3, 0)) return false; return this.mCasing >= 19 && this.mRadHatches.size() <= 1 - && this.mOutputHatches.size() == 1 - && this.mMaintenanceHatches.size() == 1 - && this.mInputHatches.size() > 0 - && this.mEnergyHatches.size() > 0; + && this.mOutputHatches.size() == 1 + && this.mMaintenanceHatches.size() == 1 + && this.mInputHatches.size() > 0 + && this.mEnergyHatches.size() > 0; } @Override @@ -353,50 +364,81 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa int zDir = this.getZDir(); GT_TileEntity_BioVat.staticColorMap.remove( - new Coords( - xDir + x + this.getBaseMetaTileEntity().getXCoord(), - y + this.getBaseMetaTileEntity().getYCoord(), - zDir + z + this.getBaseMetaTileEntity().getZCoord(), - this.getBaseMetaTileEntity().getWorld().provider.dimensionId)); + new Coords( + xDir + x + + this.getBaseMetaTileEntity() + .getXCoord(), + y + this.getBaseMetaTileEntity() + .getYCoord(), + zDir + z + + this.getBaseMetaTileEntity() + .getZCoord(), + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId)); GT_TileEntity_BioVat.staticColorMap.put( - new Coords( - xDir + x + this.getBaseMetaTileEntity().getXCoord(), - y + this.getBaseMetaTileEntity().getYCoord(), - zDir + z + this.getBaseMetaTileEntity().getZCoord(), - this.getBaseMetaTileEntity().getWorld().provider.dimensionId), - lCulture == null ? BioCulture.NULLCULTURE.getColorRGB() : lCulture.getColorRGB()); + new Coords( + xDir + x + + this.getBaseMetaTileEntity() + .getXCoord(), + y + this.getBaseMetaTileEntity() + .getYCoord(), + zDir + z + + this.getBaseMetaTileEntity() + .getZCoord(), + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId), + lCulture == null ? BioCulture.NULLCULTURE.getColorRGB() : lCulture.getColorRGB()); if (SideReference.Side.Server) { MainMod.BW_Network_instance.sendPacketToAllPlayersInRange( - this.getBaseMetaTileEntity().getWorld(), - new RendererPacket( - new Coords( - xDir + x + this.getBaseMetaTileEntity().getXCoord(), - y + this.getBaseMetaTileEntity().getYCoord(), - zDir + z + this.getBaseMetaTileEntity().getZCoord(), - this.getBaseMetaTileEntity().getWorld().provider.dimensionId), - lCulture == null ? BioCulture.NULLCULTURE.getColorRGB() : lCulture.getColorRGB(), - true), - this.getBaseMetaTileEntity().getXCoord(), - this.getBaseMetaTileEntity().getZCoord()); + this.getBaseMetaTileEntity() + .getWorld(), + new RendererPacket( + new Coords( + xDir + x + + this.getBaseMetaTileEntity() + .getXCoord(), + y + this.getBaseMetaTileEntity() + .getYCoord(), + zDir + z + + this.getBaseMetaTileEntity() + .getZCoord(), + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId), + lCulture == null ? BioCulture.NULLCULTURE.getColorRGB() : lCulture.getColorRGB(), + true), + this.getBaseMetaTileEntity() + .getXCoord(), + this.getBaseMetaTileEntity() + .getZCoord()); MainMod.BW_Network_instance.sendPacketToAllPlayersInRange( - this.getBaseMetaTileEntity().getWorld(), - new RendererPacket( - new Coords( - xDir + x + this.getBaseMetaTileEntity().getXCoord(), - y + this.getBaseMetaTileEntity().getYCoord(), - zDir + z + this.getBaseMetaTileEntity().getZCoord(), - this.getBaseMetaTileEntity().getWorld().provider.dimensionId), - lCulture == null ? BioCulture.NULLCULTURE.getColorRGB() : lCulture.getColorRGB(), - false), - this.getBaseMetaTileEntity().getXCoord(), - this.getBaseMetaTileEntity().getZCoord()); + this.getBaseMetaTileEntity() + .getWorld(), + new RendererPacket( + new Coords( + xDir + x + + this.getBaseMetaTileEntity() + .getXCoord(), + y + this.getBaseMetaTileEntity() + .getYCoord(), + zDir + z + + this.getBaseMetaTileEntity() + .getZCoord(), + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId), + lCulture == null ? BioCulture.NULLCULTURE.getColorRGB() : lCulture.getColorRGB(), + false), + this.getBaseMetaTileEntity() + .getXCoord(), + this.getBaseMetaTileEntity() + .getZCoord()); } this.needsVisualUpdate = true; } private void check_Chunk() { - World aWorld = this.getBaseMetaTileEntity().getWorld(); + World aWorld = this.getBaseMetaTileEntity() + .getWorld(); if (!aWorld.isRemote) { for (Object tObject : aWorld.playerEntities) { @@ -404,10 +446,13 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa break; } Chunk tChunk = aWorld.getChunkFromBlockCoords( - this.getBaseMetaTileEntity().getXCoord(), - this.getBaseMetaTileEntity().getZCoord()); - if (tPlayer.getServerForPlayer().getPlayerManager() - .isPlayerWatchingChunk(tPlayer, tChunk.xPosition, tChunk.zPosition)) { + this.getBaseMetaTileEntity() + .getXCoord(), + this.getBaseMetaTileEntity() + .getZCoord()); + if (tPlayer.getServerForPlayer() + .getPlayerManager() + .isPlayerWatchingChunk(tPlayer, tChunk.xPosition, tChunk.zPosition)) { if (!this.playerMPHashSet.contains(tPlayer)) { this.playerMPHashSet.add(tPlayer); this.sendAllRequiredRendererPackets(); @@ -427,16 +472,29 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa if (this.mFluid != null && this.height > 1 && this.reCalculateFluidAmmount() > 0) for (int x = -1; x < 2; x++) { for (int y = 0; y < this.height; y++) { for (int z = -1; z < 2; z++) { - if (this.getBaseMetaTileEntity().getWorld() - .getBlock( - xDir + x + this.getBaseMetaTileEntity().getXCoord(), - y + this.getBaseMetaTileEntity().getYCoord(), - zDir + z + this.getBaseMetaTileEntity().getZCoord()) - .equals(Blocks.air)) - this.getBaseMetaTileEntity().getWorld().setBlock( - xDir + x + this.getBaseMetaTileEntity().getXCoord(), - y + this.getBaseMetaTileEntity().getYCoord(), - zDir + z + this.getBaseMetaTileEntity().getZCoord(), + if (this.getBaseMetaTileEntity() + .getWorld() + .getBlock( + xDir + x + + this.getBaseMetaTileEntity() + .getXCoord(), + y + this.getBaseMetaTileEntity() + .getYCoord(), + zDir + z + + this.getBaseMetaTileEntity() + .getZCoord()) + .equals(Blocks.air)) + this.getBaseMetaTileEntity() + .getWorld() + .setBlock( + xDir + x + + this.getBaseMetaTileEntity() + .getXCoord(), + y + this.getBaseMetaTileEntity() + .getYCoord(), + zDir + z + + this.getBaseMetaTileEntity() + .getZCoord(), FluidLoader.bioFluidBlock); } } @@ -449,73 +507,107 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa for (int x = -1; x < 2; x++) { for (int y = 1; y < 3; y++) { for (int z = -1; z < 2; z++) { - if (this.getBaseMetaTileEntity().getWorld() - .getBlock( - xDir + x + this.getBaseMetaTileEntity().getXCoord(), - y + this.getBaseMetaTileEntity().getYCoord(), - zDir + z + this.getBaseMetaTileEntity().getZCoord()) - .equals(FluidLoader.bioFluidBlock)) - this.getBaseMetaTileEntity().getWorld().setBlockToAir( - xDir + x + this.getBaseMetaTileEntity().getXCoord(), - y + this.getBaseMetaTileEntity().getYCoord(), - zDir + z + this.getBaseMetaTileEntity().getZCoord()); + if (this.getBaseMetaTileEntity() + .getWorld() + .getBlock( + xDir + x + + this.getBaseMetaTileEntity() + .getXCoord(), + y + this.getBaseMetaTileEntity() + .getYCoord(), + zDir + z + + this.getBaseMetaTileEntity() + .getZCoord()) + .equals(FluidLoader.bioFluidBlock)) + this.getBaseMetaTileEntity() + .getWorld() + .setBlockToAir( + xDir + x + + this.getBaseMetaTileEntity() + .getXCoord(), + y + this.getBaseMetaTileEntity() + .getYCoord(), + zDir + z + + this.getBaseMetaTileEntity() + .getZCoord()); GT_TileEntity_BioVat.staticColorMap.remove( - new Coords( - xDir + x + this.getBaseMetaTileEntity().getXCoord(), - y + this.getBaseMetaTileEntity().getYCoord(), - zDir + z + this.getBaseMetaTileEntity().getZCoord()), - this.getBaseMetaTileEntity().getWorld().provider.dimensionId); + new Coords( + xDir + x + + this.getBaseMetaTileEntity() + .getXCoord(), + y + this.getBaseMetaTileEntity() + .getYCoord(), + zDir + z + + this.getBaseMetaTileEntity() + .getZCoord()), + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId); } } } } private int reCalculateFluidAmmount() { - return this.getStoredFluids().stream().mapToInt(fluidStack -> fluidStack.amount).sum(); + return this.getStoredFluids() + .stream() + .mapToInt(fluidStack -> fluidStack.amount) + .sum(); } private int reCalculateHeight() { return this.reCalculateFluidAmmount() > this.getCapacity() / 4 - 1 - ? this.reCalculateFluidAmmount() >= this.getCapacity() / 2 ? 3 : 2 - : 1; + ? this.reCalculateFluidAmmount() >= this.getCapacity() / 2 ? 3 : 2 + : 1; } public void doAllVisualThings() { - if (this.getBaseMetaTileEntity().isServerSide()) { + if (this.getBaseMetaTileEntity() + .isServerSide()) { if (this.mMachine) { ItemStack aStack = this.mInventory[1]; BioCulture lCulture = null; int xDir = this.getXDir(); int zDir = this.getZDir(); - if (this.getBaseMetaTileEntity().getTimer() % 200 == 0) { + if (this.getBaseMetaTileEntity() + .getTimer() % 200 == 0) { this.check_Chunk(); } - if (this.needsVisualUpdate - && this.getBaseMetaTileEntity().getTimer() % GT_TileEntity_BioVat.TIMERDIVIDER == 0) { - for (int x = -1; x < 2; x++) for (int y = 1; y < 3; y++) - for (int z = -1; z < 2; z++) this.getBaseMetaTileEntity().getWorld().setBlockToAir( - xDir + x + this.getBaseMetaTileEntity().getXCoord(), - y + this.getBaseMetaTileEntity().getYCoord(), - zDir + z + this.getBaseMetaTileEntity().getZCoord()); + if (this.needsVisualUpdate && this.getBaseMetaTileEntity() + .getTimer() % GT_TileEntity_BioVat.TIMERDIVIDER == 0) { + for (int x = -1; x < 2; x++) + for (int y = 1; y < 3; y++) for (int z = -1; z < 2; z++) this.getBaseMetaTileEntity() + .getWorld() + .setBlockToAir( + xDir + x + + this.getBaseMetaTileEntity() + .getXCoord(), + y + this.getBaseMetaTileEntity() + .getYCoord(), + zDir + z + + this.getBaseMetaTileEntity() + .getZCoord()); } this.height = this.reCalculateHeight(); if (this.mFluid != null && this.height > 1 && this.reCalculateFluidAmmount() > 0) { - if (!BW_Util.areStacksEqualOrNull(aStack, this.mStack) || this.needsVisualUpdate - && this.getBaseMetaTileEntity().getTimer() % GT_TileEntity_BioVat.TIMERDIVIDER == 1) { + if (!BW_Util.areStacksEqualOrNull(aStack, this.mStack) + || this.needsVisualUpdate && this.getBaseMetaTileEntity() + .getTimer() % GT_TileEntity_BioVat.TIMERDIVIDER == 1) { for (int x = -1; x < 2; x++) { for (int y = 1; y < this.height; y++) { for (int z = -1; z < 2; z++) { if (aStack == null - || aStack.getItem() instanceof LabParts && aStack.getItemDamage() == 0) { + || aStack.getItem() instanceof LabParts && aStack.getItemDamage() == 0) { if (this.mCulture == null || aStack == null - || aStack.getTagCompound() == null - || this.mCulture.getID() != aStack.getTagCompound().getInteger("ID")) { + || aStack.getTagCompound() == null + || this.mCulture.getID() != aStack.getTagCompound() + .getInteger("ID")) { lCulture = aStack == null || aStack.getTagCompound() == null ? null - : BioCulture - .getBioCulture(aStack.getTagCompound().getString("Name")); + : BioCulture.getBioCulture( + aStack.getTagCompound() + .getString("Name")); this.sendPackagesOrRenewRenderer(x, y, z, lCulture); } } @@ -525,9 +617,10 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa this.mStack = aStack; this.mCulture = lCulture; } - if (this.needsVisualUpdate - && this.getBaseMetaTileEntity().getTimer() % GT_TileEntity_BioVat.TIMERDIVIDER == 1) { - if (this.getBaseMetaTileEntity().isClientSide()) new Throwable().printStackTrace(); + if (this.needsVisualUpdate && this.getBaseMetaTileEntity() + .getTimer() % GT_TileEntity_BioVat.TIMERDIVIDER == 1) { + if (this.getBaseMetaTileEntity() + .isClientSide()) new Throwable().printStackTrace(); this.placeFluid(); this.needsVisualUpdate = false; } @@ -543,10 +636,12 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa super.onPostTick(aBaseMetaTileEntity, aTick); if (this.height != this.reCalculateHeight()) this.needsVisualUpdate = true; this.doAllVisualThings(); - if (this.getBaseMetaTileEntity().isServerSide() && this.mRadHatches.size() == 1) { - this.mSievert = this.mRadHatches.get(0).getSievert(); - if (this.getBaseMetaTileEntity().isActive() && this.mNeededSievert > this.mSievert) - this.mOutputFluids = null; + if (this.getBaseMetaTileEntity() + .isServerSide() && this.mRadHatches.size() == 1) { + this.mSievert = this.mRadHatches.get(0) + .getSievert(); + if (this.getBaseMetaTileEntity() + .isActive() && this.mNeededSievert > this.mSievert) this.mOutputFluids = null; } if (aBaseMetaTileEntity.isServerSide() && this.mMaxProgresstime <= 0) { this.mTimes = 0; @@ -557,10 +652,11 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa @Override public void saveNBTData(NBTTagCompound aNBT) { aNBT.setInteger("mFluidHeight", this.height); - if (this.mCulture != null && !this.mCulture.getName().isEmpty()) - aNBT.setString("mCulture", this.mCulture.getName()); - else if ((this.mCulture == null || this.mCulture.getName().isEmpty()) - && !aNBT.getString("mCulture").isEmpty()) { + if (this.mCulture != null && !this.mCulture.getName() + .isEmpty()) aNBT.setString("mCulture", this.mCulture.getName()); + else if ((this.mCulture == null || this.mCulture.getName() + .isEmpty()) && !aNBT.getString("mCulture") + .isEmpty()) { aNBT.removeTag("mCulture"); } if (this.mFluid != null) aNBT.setString("mFluid", this.mFluid.getName()); @@ -577,19 +673,23 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa int zDir = this.getZDir(); this.removeFluid(xDir, zDir); this.sendRenderPackets(xDir, zDir); - } else if (this.getBaseMetaTileEntity().getWorld().getWorldTime() % 20 == 7) { - this.sendRenderPackets(); - } + } else if (this.getBaseMetaTileEntity() + .getWorld() + .getWorldTime() % 20 == 7) { + this.sendRenderPackets(); + } super.onRemoval(); } private int getXDir() { - return this.getBaseMetaTileEntity().getBackFacing().offsetX * 2; + return this.getBaseMetaTileEntity() + .getBackFacing().offsetX * 2; } private int getZDir() { - return this.getBaseMetaTileEntity().getBackFacing().offsetZ * 2; + return this.getBaseMetaTileEntity() + .getBackFacing().offsetZ * 2; } private void sendRenderPackets() { @@ -604,18 +704,27 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa for (int y = 1; y < 3; y++) { for (int z = -1; z < 2; z++) { MainMod.BW_Network_instance.sendPacketToAllPlayersInRange( - this.getBaseMetaTileEntity().getWorld(), - new RendererPacket( - new Coords( - xDir + x + this.getBaseMetaTileEntity().getXCoord(), - y + this.getBaseMetaTileEntity().getYCoord(), - zDir + z + this.getBaseMetaTileEntity().getZCoord(), - this.getBaseMetaTileEntity().getWorld().provider.dimensionId), - this.mCulture == null ? BioCulture.NULLCULTURE.getColorRGB() - : this.mCulture.getColorRGB(), - true), - this.getBaseMetaTileEntity().getXCoord(), - this.getBaseMetaTileEntity().getZCoord()); + this.getBaseMetaTileEntity() + .getWorld(), + new RendererPacket( + new Coords( + xDir + x + + this.getBaseMetaTileEntity() + .getXCoord(), + y + this.getBaseMetaTileEntity() + .getYCoord(), + zDir + z + + this.getBaseMetaTileEntity() + .getZCoord(), + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId), + this.mCulture == null ? BioCulture.NULLCULTURE.getColorRGB() + : this.mCulture.getColorRGB(), + true), + this.getBaseMetaTileEntity() + .getXCoord(), + this.getBaseMetaTileEntity() + .getZCoord()); } } } @@ -626,7 +735,8 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa public void loadNBTData(NBTTagCompound aNBT) { this.height = aNBT.getInteger("mFluidHeight"); this.mCulture = BioCulture.getBioCulture(aNBT.getString("mCulture")); - if (!aNBT.getString("mFluid").isEmpty()) this.mFluid = FluidRegistry.getFluid(aNBT.getString("mFluid")); + if (!aNBT.getString("mFluid") + .isEmpty()) this.mFluid = FluidRegistry.getFluid(aNBT.getString("mFluid")); this.mSievert = aNBT.getInteger("mSievert"); this.mNeededSievert = aNBT.getInteger("mNeededSievert"); super.loadNBTData(aNBT); @@ -645,16 +755,27 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DISTILLATION_TOWER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_GLOW).extFacing().glow() - .build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DISTILLATION_TOWER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX) }; } @@ -672,18 +793,18 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa // See https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11923 // here we must check the machine is well-formed as otherwise getExpectedMultiplier might error out! infoData[infoData.length - 2] = StatCollector.translateToLocal("BW.infoData.BioVat.expectedProduction") + ": " - + EnumChatFormatting.GREEN - + (this.mMachine - ? (this.mMaxProgresstime <= 0 ? this.getExpectedMultiplier(null, false) - : this.mExpectedMultiplier) * 100 - : -1) - + EnumChatFormatting.RESET - + " %"; + + EnumChatFormatting.GREEN + + (this.mMachine + ? (this.mMaxProgresstime <= 0 ? this.getExpectedMultiplier(null, false) : this.mExpectedMultiplier) + * 100 + : -1) + + EnumChatFormatting.RESET + + " %"; infoData[infoData.length - 1] = StatCollector.translateToLocal("BW.infoData.BioVat.production") + ": " - + EnumChatFormatting.GREEN - + (this.mMaxProgresstime <= 0 ? 0 : this.mTimes) * 100 - + EnumChatFormatting.RESET - + " %"; + + EnumChatFormatting.GREEN + + (this.mMaxProgresstime <= 0 ? 0 : this.mTimes) * 100 + + EnumChatFormatting.RESET + + " %"; return infoData; } @@ -699,7 +820,7 @@ public class GT_TileEntity_BioVat extends GT_MetaTileEntity_EnhancedMultiBlockBa @Override public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, - float aX, float aY, float aZ) { + float aX, float aY, float aZ) { if (aPlayer.isSneaking()) { batchMode = !batchMode; if (batchMode) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java index 199710cbeb..1f85ea0167 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java @@ -90,7 +90,7 @@ import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; public class GT_TileEntity_CircuitAssemblyLine extends - GT_MetaTileEntity_EnhancedMultiBlockBase<GT_TileEntity_CircuitAssemblyLine> implements ISurvivalConstructable { + GT_MetaTileEntity_EnhancedMultiBlockBase<GT_TileEntity_CircuitAssemblyLine> implements ISurvivalConstructable { private static final int CASING_INDEX = 16; @@ -110,37 +110,44 @@ public class GT_TileEntity_CircuitAssemblyLine extends private ItemStack imprintedStack; private static final IStructureDefinition<GT_TileEntity_CircuitAssemblyLine> STRUCTURE_DEFINITION = StructureDefinition - .<GT_TileEntity_CircuitAssemblyLine>builder() - .addShape( - STRUCTURE_PIECE_FIRST, - transpose(new String[][] { { "~", "G", "G" }, { "g", "l", "g" }, { "b", "i", "b" }, })) - .addShape( - STRUCTURE_PIECE_NEXT, - transpose(new String[][] { { "G", "G", "G" }, { "g", "l", "g" }, { "b", "I", "b" }, })) - .addShape( - STRUCTURE_PIECE_NEXT_HINT, - transpose(new String[][] { { "G", "G", "G" }, { "g", "l", "g" }, { "b", "i", "b" }, })) - .addShape( - STRUCTURE_PIECE_LAST, - transpose(new String[][] { { "G", "G", "G" }, { "g", "l", "g" }, { "b", "o", "b" }, })) - .addElement( - 'G', - buildHatchAdder(GT_TileEntity_CircuitAssemblyLine.class).atLeast(Energy).casingIndex(CASING_INDEX) - .dot(1).buildAndChain(GregTech_API.sBlockCasings3, 10)) - .addElement('g', ofGlassTieredMixed((byte) 4, (byte) 127, 5)) - .addElement('l', ofBlock(GregTech_API.sBlockCasings2, 5)) // assembling line casings - .addElement( - 'b', - buildHatchAdder(GT_TileEntity_CircuitAssemblyLine.class).atLeast(InputHatch, Maintenance) - .casingIndex(CASING_INDEX).dot(2).disallowOnly(ForgeDirection.EAST, ForgeDirection.WEST) - .buildAndChain(GregTech_API.sBlockCasings2, 0)) - .addElement('i', InputBus.newAny(CASING_INDEX, 3, ForgeDirection.DOWN)) - .addElement( - 'I', - buildHatchAdder(GT_TileEntity_CircuitAssemblyLine.class).atLeast(InputHatch, InputBus, OutputBus) - .casingIndex(CASING_INDEX).dot(2).disallowOnly(ForgeDirection.EAST, ForgeDirection.WEST) - .buildAndChain(GregTech_API.sBlockCasings2, 0)) - .addElement('o', OutputBus.newAny(CASING_INDEX, 2, ForgeDirection.DOWN)).build(); + .<GT_TileEntity_CircuitAssemblyLine>builder() + .addShape( + STRUCTURE_PIECE_FIRST, + transpose(new String[][] { { "~", "G", "G" }, { "g", "l", "g" }, { "b", "i", "b" }, })) + .addShape( + STRUCTURE_PIECE_NEXT, + transpose(new String[][] { { "G", "G", "G" }, { "g", "l", "g" }, { "b", "I", "b" }, })) + .addShape( + STRUCTURE_PIECE_NEXT_HINT, + transpose(new String[][] { { "G", "G", "G" }, { "g", "l", "g" }, { "b", "i", "b" }, })) + .addShape( + STRUCTURE_PIECE_LAST, + transpose(new String[][] { { "G", "G", "G" }, { "g", "l", "g" }, { "b", "o", "b" }, })) + .addElement( + 'G', + buildHatchAdder(GT_TileEntity_CircuitAssemblyLine.class).atLeast(Energy) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain(GregTech_API.sBlockCasings3, 10)) + .addElement('g', ofGlassTieredMixed((byte) 4, (byte) 127, 5)) + .addElement('l', ofBlock(GregTech_API.sBlockCasings2, 5)) // assembling line casings + .addElement( + 'b', + buildHatchAdder(GT_TileEntity_CircuitAssemblyLine.class).atLeast(InputHatch, Maintenance) + .casingIndex(CASING_INDEX) + .dot(2) + .disallowOnly(ForgeDirection.EAST, ForgeDirection.WEST) + .buildAndChain(GregTech_API.sBlockCasings2, 0)) + .addElement('i', InputBus.newAny(CASING_INDEX, 3, ForgeDirection.DOWN)) + .addElement( + 'I', + buildHatchAdder(GT_TileEntity_CircuitAssemblyLine.class).atLeast(InputHatch, InputBus, OutputBus) + .casingIndex(CASING_INDEX) + .dot(2) + .disallowOnly(ForgeDirection.EAST, ForgeDirection.WEST) + .buildAndChain(GregTech_API.sBlockCasings2, 0)) + .addElement('o', OutputBus.newAny(CASING_INDEX, 2, ForgeDirection.DOWN)) + .build(); @Override public IStructureDefinition<GT_TileEntity_CircuitAssemblyLine> getStructureDefinition() { @@ -151,45 +158,49 @@ public class GT_TileEntity_CircuitAssemblyLine extends protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Circuit Assembler/Circuit Assembly Line") - .addInfo("Controller block for the Circuit Assembly Line").addInfo("Change Mode with Screwdriver") - .addInfo("Does not lose efficiency when overclocked") - .addInfo( - "---------" + EnumChatFormatting.WHITE - + StatCollector.translateToLocal("chat.cal.mode.0") - + EnumChatFormatting.GRAY - + "--------") - .addInfo("Imprint this machine with a Circuit Imprint,") - .addInfo("by putting the imprint in the controller") - .addInfo("Every Circuit Assembly Line can only be imprinted ONCE") - .addInfo( - "---------" + EnumChatFormatting.WHITE - + StatCollector.translateToLocal("chat.cal.mode.1") - + EnumChatFormatting.GRAY - + "--------") - .addInfo( - "Does Circuit Assembler recipes, Minimum Length: " + EnumChatFormatting.RED - + MINIMUM_CIRCUIT_ASSEMBLER_LENGTH - + EnumChatFormatting.GRAY) - .addInfo("Recipe tier in Circuit Assembler mode is at most Energy Hatch tier - 1.") - .addInfo("This mode supports Crafting Input Buffer/Bus and allows bus separation").addInfo("") - .addSeparator().addInfo(BW_Tooltip_Reference.TT_BLUEPRINT) - .beginVariableStructureBlock(2, 7, 3, 3, 3, 3, false) - .addStructureInfo("From Bottom to Top, Left to Right") - .addStructureInfo( - "Layer 1 - Solid Steel Machine Casing, Input bus (Last Output bus), Solid Steel Machine Casing") - .addStructureInfo("Layer 2 - EV+ Tier Glass, Assembling Line Casing, EV+ Tier Glass") - .addStructureInfo("Layer 3 - Grate Machine Casing") - .addStructureInfo("Up to 7 repeating slices, last is Output Bus") - .addController("Layer 3 first slice front") - .addOtherStructurePart( - "1x " + StatCollector.translateToLocal("GT5U.MBTT.EnergyHatch"), - "Any layer 3 casing", - 1) - .addInputHatch("Any layer 1 casing", 2).addInputBus("As specified on layer 1", 3, 4) - .addOutputBus("As specified in final slice on layer 1", 4) - .addOtherStructurePart("EV+ Tier Glass", "As specified on layer 2", 5) - .addMaintenanceHatch("Any layer 1 casing", 2) - .toolTipFinisher(ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); + .addInfo("Controller block for the Circuit Assembly Line") + .addInfo("Change Mode with Screwdriver") + .addInfo("Does not lose efficiency when overclocked") + .addInfo( + "---------" + EnumChatFormatting.WHITE + + StatCollector.translateToLocal("chat.cal.mode.0") + + EnumChatFormatting.GRAY + + "--------") + .addInfo("Imprint this machine with a Circuit Imprint,") + .addInfo("by putting the imprint in the controller") + .addInfo("Every Circuit Assembly Line can only be imprinted ONCE") + .addInfo( + "---------" + EnumChatFormatting.WHITE + + StatCollector.translateToLocal("chat.cal.mode.1") + + EnumChatFormatting.GRAY + + "--------") + .addInfo( + "Does Circuit Assembler recipes, Minimum Length: " + EnumChatFormatting.RED + + MINIMUM_CIRCUIT_ASSEMBLER_LENGTH + + EnumChatFormatting.GRAY) + .addInfo("Recipe tier in Circuit Assembler mode is at most Energy Hatch tier - 1.") + .addInfo("This mode supports Crafting Input Buffer/Bus and allows bus separation") + .addInfo("") + .addSeparator() + .addInfo(BW_Tooltip_Reference.TT_BLUEPRINT) + .beginVariableStructureBlock(2, 7, 3, 3, 3, 3, false) + .addStructureInfo("From Bottom to Top, Left to Right") + .addStructureInfo( + "Layer 1 - Solid Steel Machine Casing, Input bus (Last Output bus), Solid Steel Machine Casing") + .addStructureInfo("Layer 2 - EV+ Tier Glass, Assembling Line Casing, EV+ Tier Glass") + .addStructureInfo("Layer 3 - Grate Machine Casing") + .addStructureInfo("Up to 7 repeating slices, last is Output Bus") + .addController("Layer 3 first slice front") + .addOtherStructurePart( + "1x " + StatCollector.translateToLocal("GT5U.MBTT.EnergyHatch"), + "Any layer 3 casing", + 1) + .addInputHatch("Any layer 1 casing", 2) + .addInputBus("As specified on layer 1", 3, 4) + .addOutputBus("As specified in final slice on layer 1", 4) + .addOtherStructurePart("EV+ Tier Glass", "As specified on layer 2", 5) + .addMaintenanceHatch("Any layer 1 casing", 2) + .toolTipFinisher(ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); return tt; } @@ -197,7 +208,7 @@ public class GT_TileEntity_CircuitAssemblyLine extends if (this.type.equals(new NBTTagCompound())) return ""; return GT_LanguageManager.getTranslation( - GT_LanguageManager.getTranslateableItemStackName(CircuitImprintLoader.getStackFromTag(this.type))); + GT_LanguageManager.getTranslateableItemStackName(CircuitImprintLoader.getStackFromTag(this.type))); } private NBTTagCompound type = new NBTTagCompound(); @@ -214,11 +225,12 @@ public class GT_TileEntity_CircuitAssemblyLine extends if (!this.type.equals(new NBTTagCompound())) return true; if (!GT_Utility.isStackValid(itemStack)) return false; if (itemStack.getItem() instanceof BW_Meta_Items.BW_GT_MetaGenCircuits && itemStack.getItemDamage() == 0 - && itemStack.getTagCompound() != null - && this.type.equals(new NBTTagCompound())) { + && itemStack.getTagCompound() != null + && this.type.equals(new NBTTagCompound())) { this.type = itemStack.getTagCompound(); this.mInventory[1] = null; - this.getBaseMetaTileEntity().issueBlockUpdate(); + this.getBaseMetaTileEntity() + .issueBlockUpdate(); return true; } return false; @@ -241,7 +253,7 @@ public class GT_TileEntity_CircuitAssemblyLine extends public void loadNBTData(NBTTagCompound aNBT) { this.type = aNBT.getCompoundTag(IMPRINT_KEY); this.imprintedItemName = this.type == null ? "" - : GT_LanguageManager.getTranslateableItemStackName(ItemStack.loadItemStackFromNBT(this.type)); + : GT_LanguageManager.getTranslateableItemStackName(ItemStack.loadItemStackFromNBT(this.type)); mode = aNBT.getInteger(RUNNING_MODE_KEY); length = aNBT.getInteger(LENGTH_KEY); super.loadNBTData(aNBT); @@ -293,7 +305,7 @@ public class GT_TileEntity_CircuitAssemblyLine extends protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { // limit CA mode recipes to hatch tier - 1 if (GT_TileEntity_CircuitAssemblyLine.this.mode == 1 - && recipe.mEUt > GT_TileEntity_CircuitAssemblyLine.this.getMaxInputVoltage() / 4) { + && recipe.mEUt > GT_TileEntity_CircuitAssemblyLine.this.getMaxInputVoltage() / 4) { return CheckRecipeResultRegistry.NO_RECIPE; } return CheckRecipeResultRegistry.SUCCESSFUL; @@ -336,9 +348,13 @@ public class GT_TileEntity_CircuitAssemblyLine extends ArrayList<ItemStack> rList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_InputBus tHatch : filterValidMTEs(mInputBusses)) { tHatch.mRecipeMap = this.getRecipeMap(); - for (int i = 0; i < tHatch.getBaseMetaTileEntity().getSizeInventory(); i++) { - if (tHatch.getBaseMetaTileEntity().getStackInSlot(i) != null) { - rList.add(tHatch.getBaseMetaTileEntity().getStackInSlot(i)); + for (int i = 0; i < tHatch.getBaseMetaTileEntity() + .getSizeInventory(); i++) { + if (tHatch.getBaseMetaTileEntity() + .getStackInSlot(i) != null) { + rList.add( + tHatch.getBaseMetaTileEntity() + .getStackInSlot(i)); break; } } @@ -418,22 +434,34 @@ public class GT_TileEntity_CircuitAssemblyLine extends this.infoDataBuffer = new String[oldInfo.length + 1]; System.arraycopy(oldInfo, 0, this.infoDataBuffer, 0, oldInfo.length); this.infoDataBuffer[oldInfo.length] = StatCollector.translateToLocal("tooltip.cal.imprintedWith") + " " - + EnumChatFormatting.YELLOW - + this.getTypeForDisplay(); + + EnumChatFormatting.YELLOW + + this.getTypeForDisplay(); return this.infoDataBuffer; } @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ASSEMBLY_LINE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_GLOW).extFacing().glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX) }; } @@ -481,57 +509,58 @@ public class GT_TileEntity_CircuitAssemblyLine extends for (int i = 1; i < tLength - 1; ++i) { built = survivialBuildPiece( - STRUCTURE_PIECE_NEXT_HINT, - stackSize, - -i, - 0, - 0, - elementBudget, - env, - false, - true); - if (built >= 0) return built; - } - return survivialBuildPiece( - STRUCTURE_PIECE_LAST, + STRUCTURE_PIECE_NEXT_HINT, stackSize, - -(tLength - 1), + -i, 0, 0, elementBudget, env, false, true); + if (built >= 0) return built; + } + return survivialBuildPiece( + STRUCTURE_PIECE_LAST, + stackSize, + -(tLength - 1), + 0, + 0, + elementBudget, + env, + false, + true); } @Override public void addAdditionalTooltipInformation(ItemStack stack, List<String> tooltip) { if (stack.hasTagCompound() && stack.stackTagCompound.hasKey(IMPRINT_KEY)) { tooltip.add( - StatCollector.translateToLocal("tooltip.cal.imprintedWith") + " " - + EnumChatFormatting.YELLOW - + StatCollector.translateToLocal( - GT_LanguageManager.getTranslateableItemStackName( - ItemStack.loadItemStackFromNBT( - stack.stackTagCompound.getCompoundTag("Type"))))); + StatCollector.translateToLocal("tooltip.cal.imprintedWith") + " " + + EnumChatFormatting.YELLOW + + StatCollector.translateToLocal( + GT_LanguageManager.getTranslateableItemStackName( + ItemStack.loadItemStackFromNBT(stack.stackTagCompound.getCompoundTag("Type"))))); } } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { super.addUIWidgets(builder, buildContext); + builder + .widget(new FakeSyncWidget.StringSyncer(() -> this.imprintedItemName, val -> this.imprintedItemName = val)); builder.widget( - new FakeSyncWidget.StringSyncer(() -> this.imprintedItemName, val -> this.imprintedItemName = val)); - builder.widget( - new CycleButtonWidget().setToggle(() -> mode == 1, val -> mode = val ? 1 : 0) - .setTextureGetter( - state -> state == 1 ? BW_UITextures.OVERLAY_BUTTON_ASSEMBLER_MODE - : BW_UITextures.OVERLAY_BUTTON_LINE_MODE) - .setBackground(GT_UITextures.BUTTON_STANDARD).setPos(80, 91).setSize(16, 16) - .dynamicTooltip( - () -> Collections - .singletonList(StatCollector.translateToLocal("chat.cal.mode." + mode))) - .setUpdateTooltipEveryTick(true).setTooltipShowUpDelay(TOOLTIP_DELAY)); + new CycleButtonWidget().setToggle(() -> mode == 1, val -> mode = val ? 1 : 0) + .setTextureGetter( + state -> state == 1 ? BW_UITextures.OVERLAY_BUTTON_ASSEMBLER_MODE + : BW_UITextures.OVERLAY_BUTTON_LINE_MODE) + .setBackground(GT_UITextures.BUTTON_STANDARD) + .setPos(80, 91) + .setSize(16, 16) + .dynamicTooltip( + () -> Collections.singletonList(StatCollector.translateToLocal("chat.cal.mode." + mode))) + .setUpdateTooltipEveryTick(true) + .setTooltipShowUpDelay(TOOLTIP_DELAY)); } @Override @@ -546,13 +575,13 @@ public class GT_TileEntity_CircuitAssemblyLine extends @Override public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, - float aX, float aY, float aZ) { + float aX, float aY, float aZ) { if (!aPlayer.isSneaking()) { if (mode == 0) return false; inputSeparation = !inputSeparation; GT_Utility.sendChatToPlayer( - aPlayer, - StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); + aPlayer, + StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); return true; } else { batchMode = !batchMode; @@ -582,22 +611,22 @@ public class GT_TileEntity_CircuitAssemblyLine extends @Override public void getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, - IWailaConfigHandler config) { + IWailaConfigHandler config) { super.getWailaBody(itemStack, currenttip, accessor, config); NBTTagCompound tag = accessor.getNBTData(); currenttip.add( - EnumChatFormatting.GREEN - + StatCollector.translateToLocal("chat.cal.mode." + tag.getInteger(RUNNING_MODE_KEY))); + EnumChatFormatting.GREEN + + StatCollector.translateToLocal("chat.cal.mode." + tag.getInteger(RUNNING_MODE_KEY))); if (tag.hasKey("ImprintedWith") && tag.getInteger(RUNNING_MODE_KEY) == 0) currenttip.add( - StatCollector.translateToLocal("tooltip.cal.imprintedWith") + " " - + EnumChatFormatting.YELLOW - + tag.getString("ImprintedWith")); + StatCollector.translateToLocal("tooltip.cal.imprintedWith") + " " + + EnumChatFormatting.YELLOW + + tag.getString("ImprintedWith")); } @Override public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y, - int z) { + int z) { super.getWailaNBTData(player, tile, tag, world, x, y, z); String imprintedWith = this.getTypeForDisplay(); if (!imprintedWith.isEmpty()) tag.setString("ImprintedWith", imprintedWith); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java index c125d4150e..f394089fb0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java @@ -66,7 +66,7 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { f.setAccessible(true); GT_TileEntity_DEHP.nulearHeatMod = f.getFloat(f); } catch (SecurityException | IllegalArgumentException | ExceptionInInitializerError | NullPointerException - | IllegalAccessException | NoSuchFieldException e) { + | IllegalAccessException | NoSuchFieldException e) { e.printStackTrace(); } super.onConfigLoad(aConfig); @@ -94,34 +94,43 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - String casings = this.getCasingBlockItem().get(0).getDisplayName(); - tt.addMachineType("Geothermal Heat Pump").addInfo("Consumes " + GT_Values.V[this.mTier + 2] + "EU/t") - .addInfo("Has 4 Modes, use the Screwdriver to change them:"); + String casings = this.getCasingBlockItem() + .get(0) + .getDisplayName(); + tt.addMachineType("Geothermal Heat Pump") + .addInfo("Consumes " + GT_Values.V[this.mTier + 2] + "EU/t") + .addInfo("Has 4 Modes, use the Screwdriver to change them:"); if (ConfigHandler.DEHPDirectSteam) { tt.addInfo("0 Idle, 1 Steam, 2 Superheated Steam (requires Distilled Water), 3 Retract") - .addInfo("Explodes when it runs out of Water/Distilled Water") - .addInfo( - "Converts " + (long) (this.mTier * 1200 * 20) - + "L/s Water(minus 10% per Maintenance Problem) to Steam") - .addInfo( - "Converts " + (long) (this.mTier * 600 * 20) - + "L/s Distilled Water(minus 10% per Maintenance Problem) to SuperheatedSteam"); + .addInfo("Explodes when it runs out of Water/Distilled Water") + .addInfo( + "Converts " + (long) (this.mTier * 1200 * 20) + + "L/s Water(minus 10% per Maintenance Problem) to Steam") + .addInfo( + "Converts " + (long) (this.mTier * 600 * 20) + + "L/s Distilled Water(minus 10% per Maintenance Problem) to SuperheatedSteam"); } else { tt.addInfo("0 Idle, 1 & 2 Coolant Heating Mode (no Difference between them), 3 Retract") - .addInfo("Explodes when it runs out of Coolant").addInfo( - "Heats up " + (long) (this.mTier * 24 * (double) GT_TileEntity_DEHP.nulearHeatMod) * 20 - + "L/s Coolant(minus 10% per Maintenance Problem)"); + .addInfo("Explodes when it runs out of Coolant") + .addInfo( + "Heats up " + (long) (this.mTier * 24 * (double) GT_TileEntity_DEHP.nulearHeatMod) * 20 + + "L/s Coolant(minus 10% per Maintenance Problem)"); } - tt.addSeparator().beginStructureBlock(3, 7, 3, false).addController("Front bottom") - .addOtherStructurePart(casings, "form the 3x1x3 Base") - .addOtherStructurePart(casings, "1x3x1 pillar above the center of the base (2 minimum total)") - .addOtherStructurePart( - this.getFrameMaterial().mName + " Frame Boxes", - "Each pillar's side and 1x3x1 on top") - .addEnergyHatch(VN[this.getMinTier()] + "+, Any base casing").addMaintenanceHatch("Any base casing") - .addInputBus("Mining Pipes, optional, any base casing").addInputHatch("Any base casing") - .addOutputHatch("Any base casing").toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); + tt.addSeparator() + .beginStructureBlock(3, 7, 3, false) + .addController("Front bottom") + .addOtherStructurePart(casings, "form the 3x1x3 Base") + .addOtherStructurePart(casings, "1x3x1 pillar above the center of the base (2 minimum total)") + .addOtherStructurePart( + this.getFrameMaterial().mName + " Frame Boxes", + "Each pillar's side and 1x3x1 on top") + .addEnergyHatch(VN[this.getMinTier()] + "+, Any base casing") + .addMaintenanceHatch("Any base casing") + .addInputBus("Mining Pipes, optional, any base casing") + .addInputHatch("Any base casing") + .addOutputHatch("Any base casing") + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); return tt; } @@ -153,18 +162,26 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { private long getFluidFromHatches(Fluid f) { long ret = 0; for (GT_MetaTileEntity_Hatch_Input ih : this.mInputHatches) { - if (ih.getFluid().getFluid().equals(f)) ret += ih.getFluidAmount(); + if (ih.getFluid() + .getFluid() + .equals(f)) ret += ih.getFluidAmount(); } return ret; } private long getWaterFromHatches(boolean onlyDistilled) { Fluid toConsume1 = FluidRegistry.WATER; - Fluid toConsume2 = GT_ModHandler.getDistilledWater(1L).getFluid(); + Fluid toConsume2 = GT_ModHandler.getDistilledWater(1L) + .getFluid(); if (onlyDistilled) toConsume1 = toConsume2; long ret = 0; for (GT_MetaTileEntity_Hatch_Input ih : this.mInputHatches) { - if (ih.getFluid().getFluid().equals(toConsume1) || ih.getFluid().getFluid().equals(toConsume2)) + if (ih.getFluid() + .getFluid() + .equals(toConsume1) + || ih.getFluid() + .getFluid() + .equals(toConsume2)) ret += ih.getFluidAmount(); } return ret; @@ -172,11 +189,12 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { @Override protected boolean workingUpward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, - int yHead, int oldYHead) { + int yHead, int oldYHead) { if (this.mMode != 3) { this.isPickingPipes = false; try { - Field workState = this.getClass().getField("workState"); + Field workState = this.getClass() + .getField("workState"); workState.setInt(this, 0); } catch (NoSuchFieldError | NoSuchFieldException | IllegalAccessException ignored) {} return true; @@ -186,7 +204,8 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { @Override public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (this.getBaseMetaTileEntity().getWorld().isRemote) return; + if (this.getBaseMetaTileEntity() + .getWorld().isRemote) return; ++this.mMode; if (this.mMode >= 4) this.mMode = 0; GT_Utility.sendChatToPlayer(aPlayer, "Mode: " + this.mMode); @@ -195,11 +214,13 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { @Override protected boolean workingDownward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, - int yHead, int oldYHead) { + int yHead, int oldYHead) { if (this.mMode == 3) { this.isPickingPipes = true; try { - Field workState = this.getClass().getSuperclass().getDeclaredField("workState"); + Field workState = this.getClass() + .getSuperclass() + .getDeclaredField("workState"); workState.setInt(this, 2); } catch (NoSuchFieldError | NoSuchFieldException | IllegalAccessException ignored) {} return true; @@ -231,7 +252,10 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { long waterConsume = (steamProduced + 160) / 160; if (this.getWaterFromHatches(true) - waterConsume > 0) { - this.consumeFluid(GT_ModHandler.getDistilledWater(1).getFluid(), waterConsume); + this.consumeFluid( + GT_ModHandler.getDistilledWater(1) + .getFluid(), + waterConsume); this.addOutput(FluidRegistry.getFluidStack("ic2superheatedsteam", (int) steamProduced)); } else { this.explodeMultiblock(); @@ -240,9 +264,9 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { } } else if (this.mMode == 1 || this.mMode == 2) { long coolantConverted = (long) (this.mTier * 24 - * (double) GT_TileEntity_DEHP.nulearHeatMod - * this.mEfficiency - / 10000L); + * (double) GT_TileEntity_DEHP.nulearHeatMod + * this.mEfficiency + / 10000L); if (this.getFluidFromHatches(FluidRegistry.getFluid("ic2coolant")) - coolantConverted > 0) { this.consumeFluid(FluidRegistry.getFluid("ic2coolant"), coolantConverted); this.addOutput(FluidRegistry.getFluidStack("ic2hotcoolant", (int) coolantConverted)); @@ -260,10 +284,17 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { Arrays.fill(tmp, (int) (ammount / Integer.MAX_VALUE)); for (int i = 0; i < tmp.length; i++) { for (GT_MetaTileEntity_Hatch_Input ih : this.mInputHatches) { - if (fluid.equals(FluidRegistry.WATER) - ? ih.getFluid().getFluid().equals(fluid) - || ih.getFluid().getFluid().equals(GT_ModHandler.getDistilledWater(1).getFluid()) - : ih.getFluid().getFluid().equals(fluid)) + if (fluid.equals(FluidRegistry.WATER) ? ih.getFluid() + .getFluid() + .equals(fluid) + || ih.getFluid() + .getFluid() + .equals( + GT_ModHandler.getDistilledWater(1) + .getFluid()) + : ih.getFluid() + .getFluid() + .equals(fluid)) tmp[i] -= ih.drain((int) ammount, true).amount; if (tmp[i] <= 0) break; } @@ -274,10 +305,17 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { long tmp = ammount; for (GT_MetaTileEntity_Hatch_Input ih : this.mInputHatches) { - if (fluid.equals(FluidRegistry.WATER) - ? ih.getFluid().getFluid().equals(fluid) - || ih.getFluid().getFluid().equals(GT_ModHandler.getDistilledWater(1).getFluid()) - : ih.getFluid().getFluid().equals(fluid)) + if (fluid.equals(FluidRegistry.WATER) ? ih.getFluid() + .getFluid() + .equals(fluid) + || ih.getFluid() + .getFluid() + .equals( + GT_ModHandler.getDistilledWater(1) + .getFluid()) + : ih.getFluid() + .getFluid() + .equals(fluid)) tmp -= ih.drain((int) ammount, true).amount; if (tmp <= 0) return true; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java index 9a424b1cde..cb2140d62b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java @@ -79,8 +79,8 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; public class GT_TileEntity_ElectricImplosionCompressor - extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_TileEntity_ElectricImplosionCompressor> - implements ISurvivalConstructable { + extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<GT_TileEntity_ElectricImplosionCompressor> + implements ISurvivalConstructable { private static final boolean pistonEnabled = !ConfigHandler.disablePistonInEIC; private Boolean piston = true; @@ -100,85 +100,91 @@ public class GT_TileEntity_ElectricImplosionCompressor private static final int CASING_INDEX = 16; private static final String STRUCTURE_PIECE_MAIN = "main"; private static final IStructureDefinition<GT_TileEntity_ElectricImplosionCompressor> STRUCTURE_DEFINITION = StructureDefinition - .<GT_TileEntity_ElectricImplosionCompressor>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "ccc", "cec", "ccc" }, { "ttt", "tft", "ttt" }, { "ttt", "tft", "ttt" }, - { "nnn", "nnn", "nnn" }, { "nNn", "NNN", "nNn" }, { "nnn", "nnn", "nnn" }, - { "t~t", "tft", "ttt" }, { "ttt", "tft", "ttt" }, { "CCC", "CeC", "CCC" }, })) - .addElement('c', ofChain(ofBlock(GregTech_API.sBlockCasings2, 0), ofBlock(GregTech_API.sBlockCasings3, 4))) - .addElement('t', ofBlock(BW_BLOCKS[2], 1)).addElement('f', ofBlock(BW_BLOCKS[2], 0)) - .addElement( - 'n', - StructureUtility.ofBlocksTiered( - tieredBlockConverter(), - getAllBlockTiers(), - 0, - GT_TileEntity_ElectricImplosionCompressor::setBlockTier, - GT_TileEntity_ElectricImplosionCompressor::getBlockTier)) - .addElement( - 'C', - buildHatchAdder(GT_TileEntity_ElectricImplosionCompressor.class) - .atLeast(InputBus, OutputBus, Maintenance, InputHatch, OutputHatch) - .casingIndex(CASING_INDEX).dot(1).buildAndChain( - onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings2, 0)), - onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings3, 4)))) - .addElement( - 'e', - buildHatchAdder(GT_TileEntity_ElectricImplosionCompressor.class).atLeast(Energy.or(ExoticEnergy)) - .casingIndex(CASING_INDEX).dot(2).buildAndChain( - onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings2, 0)), - onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings3, 4)))) - .addElement('N', new IStructureElement<>() { - - // Much of this based on StructureUtility.ofBlocksTiered - private final List<Pair<Block, Integer>> tiers = getAllBlockTiers(); - - @Override - public boolean check(GT_TileEntity_ElectricImplosionCompressor te, World world, int x, int y, int z) { - if (!te.piston && !world.isAirBlock(x, y, z)) return false; - if (te.piston) { - Block candidate = world.getBlock(x, y, z); - int candidateMeta = world.getBlockMetadata(x, y, z); - return getTierOfBlock(candidate, candidateMeta) != -1; - } - return true; - } + .<GT_TileEntity_ElectricImplosionCompressor>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { { "ccc", "cec", "ccc" }, { "ttt", "tft", "ttt" }, { "ttt", "tft", "ttt" }, + { "nnn", "nnn", "nnn" }, { "nNn", "NNN", "nNn" }, { "nnn", "nnn", "nnn" }, { "t~t", "tft", "ttt" }, + { "ttt", "tft", "ttt" }, { "CCC", "CeC", "CCC" }, })) + .addElement('c', ofChain(ofBlock(GregTech_API.sBlockCasings2, 0), ofBlock(GregTech_API.sBlockCasings3, 4))) + .addElement('t', ofBlock(BW_BLOCKS[2], 1)) + .addElement('f', ofBlock(BW_BLOCKS[2], 0)) + .addElement( + 'n', + StructureUtility.ofBlocksTiered( + tieredBlockConverter(), + getAllBlockTiers(), + 0, + GT_TileEntity_ElectricImplosionCompressor::setBlockTier, + GT_TileEntity_ElectricImplosionCompressor::getBlockTier)) + .addElement( + 'C', + buildHatchAdder(GT_TileEntity_ElectricImplosionCompressor.class) + .atLeast(InputBus, OutputBus, Maintenance, InputHatch, OutputHatch) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain( + onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings2, 0)), + onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings3, 4)))) + .addElement( + 'e', + buildHatchAdder(GT_TileEntity_ElectricImplosionCompressor.class).atLeast(Energy.or(ExoticEnergy)) + .casingIndex(CASING_INDEX) + .dot(2) + .buildAndChain( + onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings2, 0)), + onElementPass(x -> ++x.mCasing, ofBlock(GregTech_API.sBlockCasings3, 4)))) + .addElement('N', new IStructureElement<>() { + + // Much of this based on StructureUtility.ofBlocksTiered + private final List<Pair<Block, Integer>> tiers = getAllBlockTiers(); - private Pair<Block, Integer> getTier(ItemStack trigger) { - return this.tiers.get(Math.min(Math.max(trigger.stackSize, 1), this.tiers.size()) - 1); + @Override + public boolean check(GT_TileEntity_ElectricImplosionCompressor te, World world, int x, int y, int z) { + if (!te.piston && !world.isAirBlock(x, y, z)) return false; + if (te.piston) { + Block candidate = world.getBlock(x, y, z); + int candidateMeta = world.getBlockMetadata(x, y, z); + return getTierOfBlock(candidate, candidateMeta) != -1; } + return true; + } - @Override - public boolean spawnHint(GT_TileEntity_ElectricImplosionCompressor te, World world, int x, int y, int z, - ItemStack itemStack) { - Pair<Block, Integer> tier = this.getTier(itemStack); - if (te.piston) StructureLibAPI.hintParticle(world, x, y, z, tier.getKey(), tier.getValue()); - return true; - } + private Pair<Block, Integer> getTier(ItemStack trigger) { + return this.tiers.get(Math.min(Math.max(trigger.stackSize, 1), this.tiers.size()) - 1); + } - @Override - public boolean placeBlock(GT_TileEntity_ElectricImplosionCompressor te, World world, int x, int y, - int z, ItemStack itemStack) { - Pair<Block, Integer> tier = this.getTier(itemStack); - if (te.piston) world.setBlock(x, y, z, tier.getKey(), tier.getValue(), 3); - else world.setBlockToAir(x, y, z); - return true; - } + @Override + public boolean spawnHint(GT_TileEntity_ElectricImplosionCompressor te, World world, int x, int y, int z, + ItemStack itemStack) { + Pair<Block, Integer> tier = this.getTier(itemStack); + if (te.piston) StructureLibAPI.hintParticle(world, x, y, z, tier.getKey(), tier.getValue()); + return true; + } - @Override - public BlocksToPlace getBlocksToPlace(GT_TileEntity_ElectricImplosionCompressor t, World world, int x, - int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { - return BlocksToPlace.createEmpty(); - } + @Override + public boolean placeBlock(GT_TileEntity_ElectricImplosionCompressor te, World world, int x, int y, int z, + ItemStack itemStack) { + Pair<Block, Integer> tier = this.getTier(itemStack); + if (te.piston) world.setBlock(x, y, z, tier.getKey(), tier.getValue(), 3); + else world.setBlockToAir(x, y, z); + return true; + } - @Override - public PlaceResult survivalPlaceBlock(GT_TileEntity_ElectricImplosionCompressor t, World world, int x, - int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { - return isAir().survivalPlaceBlock(t, world, x, y, z, trigger, env); - } - }).build(); + @Override + public BlocksToPlace getBlocksToPlace(GT_TileEntity_ElectricImplosionCompressor t, World world, int x, + int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { + return BlocksToPlace.createEmpty(); + } + + @Override + public PlaceResult survivalPlaceBlock(GT_TileEntity_ElectricImplosionCompressor t, World world, int x, + int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { + return isAir().survivalPlaceBlock(t, world, x, y, z, trigger, env); + } + }) + .build(); public static List<Pair<Block, Integer>> getAllBlockTiers() { return new ArrayList<>() { @@ -242,21 +248,29 @@ public class GT_TileEntity_ElectricImplosionCompressor @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Implosion Compressor").addInfo("Explosions are fun") - .addInfo("Controller block for the Electric Implosion Compressor") - .addInfo("Uses electricity instead of Explosives").addInfo("Can parallel up to 4^(Tier - 1)") - .addInfo("Tier is determined by containment block") - .addInfo("Valid blocks: Neutronium, Infinity, Transcendent Metal, Spacetime, Universium") - .addInfo("Minimum allowed energy hatch tier is one below recipe tier") - .addInfo("Supports " + TT + " energy hatches").addSeparator().beginStructureBlock(3, 9, 3, false) - .addController("Front 3rd layer center").addCasingInfoMin("Solid Steel Machine Casing", 8, false) - .addStructureInfo("Casings can be replaced with Explosion Warning Signs") - .addOtherStructurePart("Transformer-Winding Blocks", "Outer layer 2,3,7,8") - .addOtherStructurePart("Nickel-Zinc-Ferrite Blocks", "Inner layer 2,3,7,8") - .addOtherStructurePart("Containment Blocks", "Layer 4,5,6").addMaintenanceHatch("Any bottom casing", 1) - .addInputBus("Any bottom casing", 1).addInputHatch("Any bottom casing", 1) - .addOutputBus("Any bottom casing", 1).addEnergyHatch("Bottom middle and/or top middle", 2) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + tt.addMachineType("Implosion Compressor") + .addInfo("Explosions are fun") + .addInfo("Controller block for the Electric Implosion Compressor") + .addInfo("Uses electricity instead of Explosives") + .addInfo("Can parallel up to 4^(Tier - 1)") + .addInfo("Tier is determined by containment block") + .addInfo("Valid blocks: Neutronium, Infinity, Transcendent Metal, Spacetime, Universium") + .addInfo("Minimum allowed energy hatch tier is one below recipe tier") + .addInfo("Supports " + TT + " energy hatches") + .addSeparator() + .beginStructureBlock(3, 9, 3, false) + .addController("Front 3rd layer center") + .addCasingInfoMin("Solid Steel Machine Casing", 8, false) + .addStructureInfo("Casings can be replaced with Explosion Warning Signs") + .addOtherStructurePart("Transformer-Winding Blocks", "Outer layer 2,3,7,8") + .addOtherStructurePart("Nickel-Zinc-Ferrite Blocks", "Inner layer 2,3,7,8") + .addOtherStructurePart("Containment Blocks", "Layer 4,5,6") + .addMaintenanceHatch("Any bottom casing", 1) + .addInputBus("Any bottom casing", 1) + .addInputHatch("Any bottom casing", 1) + .addOutputBus("Any bottom casing", 1) + .addEnergyHatch("Bottom middle and/or top middle", 2) + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); return tt; } @@ -285,7 +299,8 @@ public class GT_TileEntity_ElectricImplosionCompressor protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { // For overclocking we'll allow all power to be used return super.createOverclockCalculator(recipe) - .setEUt(GT_TileEntity_ElectricImplosionCompressor.this.getMaxInputEu()).setAmperage(1); + .setEUt(GT_TileEntity_ElectricImplosionCompressor.this.getMaxInputEu()) + .setAmperage(1); } }.setMaxParallelSupplier(() -> (int) Math.pow(4, Math.max(this.mBlockTier - 1, 0))); } @@ -297,10 +312,14 @@ public class GT_TileEntity_ElectricImplosionCompressor if (Math.abs(x) != 1 || Math.abs(z) != 1) { int[] abc = { x, -2, z + 1 }; int[] xyz = { 0, 0, 0 }; - this.getExtendedFacing().getWorldOffset(abc, xyz); - xyz[0] += this.getBaseMetaTileEntity().getXCoord(); - xyz[1] += this.getBaseMetaTileEntity().getYCoord(); - xyz[2] += this.getBaseMetaTileEntity().getZCoord(); + this.getExtendedFacing() + .getWorldOffset(abc, xyz); + xyz[0] += this.getBaseMetaTileEntity() + .getXCoord(); + xyz[1] += this.getBaseMetaTileEntity() + .getYCoord(); + xyz[2] += this.getBaseMetaTileEntity() + .getZCoord(); this.chunkCoordinates.add(new ChunkCoordinates(xyz[0], xyz[1], xyz[2])); } } @@ -319,15 +338,15 @@ public class GT_TileEntity_ElectricImplosionCompressor if (pistonEnabled && aBaseMetaTileEntity.isActive() && aTick % 20 == 0) { if (aBaseMetaTileEntity.isClientSide()) this.animatePiston(aBaseMetaTileEntity); else if (aBaseMetaTileEntity.hasMufflerUpgrade()) MainMod.BW_Network_instance.sendPacketToAllPlayersInRange( - aBaseMetaTileEntity.getWorld(), - new EICPacket( - new Coords( - aBaseMetaTileEntity.getXCoord(), - aBaseMetaTileEntity.getYCoord(), - aBaseMetaTileEntity.getZCoord()), - true), - aBaseMetaTileEntity.getXCoord(), - aBaseMetaTileEntity.getZCoord()); + aBaseMetaTileEntity.getWorld(), + new EICPacket( + new Coords( + aBaseMetaTileEntity.getXCoord(), + aBaseMetaTileEntity.getYCoord(), + aBaseMetaTileEntity.getZCoord()), + true), + aBaseMetaTileEntity.getXCoord(), + aBaseMetaTileEntity.getZCoord()); } } @@ -358,9 +377,10 @@ public class GT_TileEntity_ElectricImplosionCompressor Pair<Block, Integer> tieredBlock = tiers.get(Math.min(tier, tiers.size()) - 1); this.chunkCoordinates.forEach(c -> { // Don't replace real blocks in case user has placed something (e.g. tier upgrade) - if (aBaseMetaTileEntity.getWorld().isAirBlock(c.posX, c.posY, c.posZ)) { + if (aBaseMetaTileEntity.getWorld() + .isAirBlock(c.posX, c.posY, c.posZ)) { aBaseMetaTileEntity.getWorld() - .setBlock(c.posX, c.posY, c.posZ, tieredBlock.getKey(), tieredBlock.getValue(), 3); + .setBlock(c.posX, c.posY, c.posZ, tieredBlock.getKey(), tieredBlock.getValue(), 3); } }); this.piston = !this.piston; @@ -372,7 +392,9 @@ public class GT_TileEntity_ElectricImplosionCompressor IGregTechTileEntity aBaseMetaTileEntity = this.getBaseMetaTileEntity(); if (!aBaseMetaTileEntity.isServerSide()) return; if (this.piston) { - this.chunkCoordinates.forEach(c -> aBaseMetaTileEntity.getWorld().setBlockToAir(c.posX, c.posY, c.posZ)); + this.chunkCoordinates.forEach( + c -> aBaseMetaTileEntity.getWorld() + .setBlockToAir(c.posX, c.posY, c.posZ)); this.piston = !this.piston; } } @@ -380,7 +402,9 @@ public class GT_TileEntity_ElectricImplosionCompressor private void animatePiston(IGregTechTileEntity aBaseMetaTileEntity) { if (!aBaseMetaTileEntity.getWorld().isRemote) return; - if (!this.getBaseMetaTileEntity().hasMufflerUpgrade()) GT_Utility.doSoundAtClient( + if (!this.getBaseMetaTileEntity() + .hasMufflerUpgrade()) + GT_Utility.doSoundAtClient( sound, 10, 1f, @@ -389,11 +413,11 @@ public class GT_TileEntity_ElectricImplosionCompressor this.chunkCoordinates.get(0).posY, this.chunkCoordinates.get(0).posZ); this.spawnVisualPistonBlocks( - aBaseMetaTileEntity.getWorld(), - this.chunkCoordinates.get(2).posX, - this.chunkCoordinates.get(2).posY, - this.chunkCoordinates.get(2).posZ, - 10); + aBaseMetaTileEntity.getWorld(), + this.chunkCoordinates.get(2).posX, + this.chunkCoordinates.get(2).posY, + this.chunkCoordinates.get(2).posZ, + 10); } @SideOnly(Side.CLIENT) @@ -463,16 +487,27 @@ public class GT_TileEntity_ElectricImplosionCompressor @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), - TextureFactory.builder().addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), - TextureFactory.builder().addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_GLOW).extFacing().glow() - .build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), TextureFactory.builder() + .addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX) }; } @@ -495,7 +530,7 @@ public class GT_TileEntity_ElectricImplosionCompressor @Override public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, - float aX, float aY, float aZ) { + float aX, float aY, float aZ) { if (aPlayer.isSneaking()) { batchMode = !batchMode; if (batchMode) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java index a676296b85..a5ed5a69b7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_HTGR.java @@ -63,63 +63,51 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase private static final String STRUCTURE_PIECE_MAIN = "main"; private static final IStructureDefinition<GT_TileEntity_HTGR> STRUCTURE_DEFINITION = StructureDefinition - .<GT_TileEntity_HTGR>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { - { " BBBBBBB ", " BBBBBBBBB ", "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", - "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", " BBBBBBBBB ", - " BBBBBBB " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " bbb~bbb ", " bbbbbbbbb ", "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", - "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", " bbbbbbbbb ", - " bbbbbbb " }, })) - .addElement('c', onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings8, 5))) - .addElement( - 'b', - ofChain( - ofHatchAdder(GT_TileEntity_HTGR::addOutputToMachineList, BASECASINGINDEX, 1), - ofHatchAdder(GT_TileEntity_HTGR::addMaintenanceToMachineList, BASECASINGINDEX, 1), - ofHatchAdder(GT_TileEntity_HTGR::addEnergyInputToMachineList, BASECASINGINDEX, 1), - onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings8, 5)))) - .addElement( - 'B', - ofChain( - ofHatchAdder(GT_TileEntity_HTGR::addInputToMachineList, BASECASINGINDEX, 2), - onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings8, 5)))) - // ofHatchAdderOptional(GT_TileEntity_HTGR::addInputToMachineList, BASECASINGINDEX, 2, - // GregTech_API.sBlockCasings8, 5)) - .build(); + .<GT_TileEntity_HTGR>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { + { " BBBBBBB ", " BBBBBBBBB ", "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", + "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", " BBBBBBBBB ", " BBBBBBB " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " bbb~bbb ", " bbbbbbbbb ", "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", + "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", " bbbbbbbbb ", " bbbbbbb " }, })) + .addElement('c', onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings8, 5))) + .addElement( + 'b', + ofChain( + ofHatchAdder(GT_TileEntity_HTGR::addOutputToMachineList, BASECASINGINDEX, 1), + ofHatchAdder(GT_TileEntity_HTGR::addMaintenanceToMachineList, BASECASINGINDEX, 1), + ofHatchAdder(GT_TileEntity_HTGR::addEnergyInputToMachineList, BASECASINGINDEX, 1), + onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings8, 5)))) + .addElement( + 'B', + ofChain( + ofHatchAdder(GT_TileEntity_HTGR::addInputToMachineList, BASECASINGINDEX, 2), + onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings8, 5)))) + // ofHatchAdderOptional(GT_TileEntity_HTGR::addInputToMachineList, BASECASINGINDEX, 2, + // GregTech_API.sBlockCasings8, 5)) + .build(); private static final int HELIUM_NEEDED = 730000; public static final int powerUsage = (int) TierEU.RECIPE_LuV; @@ -154,24 +142,30 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Breeder Reactor") - .addInfo("Controller block for the High Temperature Gas-cooled Reactor (HTGR)").addInfo(AuthorKuba) - .addInfo("You can clear internal buffer by changing the mode with a screwdriver") - .addInfo("Needs a constant supply of coolant while running") - .addInfo("Needs at least 72k Fuel pebbles to start operation (can hold up to 720k pebbles)") - .addInfo("Consumes up to 2.5% of total Fuel Pellets per Operation depending on efficiency") - .addInfo( - "Efficiency is calculated exponentially depending on the amount of pebbles in the internal buffer") - .addInfo("and affects total recipe time (at 100% eff, -50% total recipe time") - .addInfo( - "Reactor will take 4 000L/s of coolant multiplied by efficiency and by fuel coolant value (check tooltips)") - .addInfo("Uses " + GT_Utility.formatNumbers(powerUsage) + " EU/t").addInfo("One Operation takes 1 hour") - .addSeparator().beginStructureBlock(11, 12, 11, true).addController("Front bottom center") - .addCasingInfoMin("Europium Reinforced Radiation Proof Casings", 500, false) - .addStructureInfo("Corners and the 2 touching blocks are air (cylindric)") - .addInputBus("Any top layer casing", 2).addInputHatch("Any top layer casing", 2) - .addOutputBus("Any bottom layer casing", 1).addOutputHatch("Any bottom layer casing", 1) - .addEnergyHatch("Any bottom layer casing", 1).addMaintenanceHatch("Any bottom layer casing", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_VIA_BARTWORKS.apply(ChatColorHelper.GOLD + "kuba6000")); + .addInfo("Controller block for the High Temperature Gas-cooled Reactor (HTGR)") + .addInfo(AuthorKuba) + .addInfo("You can clear internal buffer by changing the mode with a screwdriver") + .addInfo("Needs a constant supply of coolant while running") + .addInfo("Needs at least 72k Fuel pebbles to start operation (can hold up to 720k pebbles)") + .addInfo("Consumes up to 2.5% of total Fuel Pellets per Operation depending on efficiency") + .addInfo("Efficiency is calculated exponentially depending on the amount of pebbles in the internal buffer") + .addInfo("and affects total recipe time (at 100% eff, -50% total recipe time") + .addInfo( + "Reactor will take 4 000L/s of coolant multiplied by efficiency and by fuel coolant value (check tooltips)") + .addInfo("Uses " + GT_Utility.formatNumbers(powerUsage) + " EU/t") + .addInfo("One Operation takes 1 hour") + .addSeparator() + .beginStructureBlock(11, 12, 11, true) + .addController("Front bottom center") + .addCasingInfoMin("Europium Reinforced Radiation Proof Casings", 500, false) + .addStructureInfo("Corners and the 2 touching blocks are air (cylindric)") + .addInputBus("Any top layer casing", 2) + .addInputHatch("Any top layer casing", 2) + .addOutputBus("Any bottom layer casing", 1) + .addOutputHatch("Any bottom layer casing", 1) + .addEnergyHatch("Any bottom layer casing", 1) + .addMaintenanceHatch("Any bottom layer casing", 1) + .toolTipFinisher(MULTIBLOCK_ADDED_VIA_BARTWORKS.apply(ChatColorHelper.GOLD + "kuba6000")); return tt; } @@ -189,12 +183,12 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack itemStack) { this.mCasing = 0; return this.checkPiece("main", 5, 11, 0) && this.mCasing >= 500 - && this.mMaintenanceHatches.size() == 1 - && this.mInputHatches.size() > 0 - && this.mOutputHatches.size() > 0 - && this.mInputBusses.size() > 0 - && this.mOutputBusses.size() > 0 - && this.mEnergyHatches.size() > 0; + && this.mMaintenanceHatches.size() == 1 + && this.mInputHatches.size() > 0 + && this.mOutputHatches.size() > 0 + && this.mInputBusses.size() > 0 + && this.mOutputBusses.size() > 0 + && this.mEnergyHatches.size() > 0; } @Override @@ -279,7 +273,7 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase if (this.HeliumSupply < GT_TileEntity_HTGR.HELIUM_NEEDED || this.fuelsupply < mincapacity) return false; double eff = Math.min(Math.pow((double) this.fuelsupply / (double) mincapacity, 2D), 100D) / 100D - - (this.getIdealStatus() - this.getRepairStatus()) / 10D; + - (this.getIdealStatus() - this.getRepairStatus()) / 10D; if (eff <= 0) return false; @@ -292,7 +286,7 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase int meta = this.fueltype * HTGRMaterials.MATERIALS_PER_FUEL + HTGRMaterials.BURNED_OUT_FUEL_INDEX; ItemStack[] toOutput = { new ItemStack(HTGRMaterials.aHTGR_Materials, burnedballs, meta), - new ItemStack(HTGRMaterials.aHTGR_Materials, toReduce, meta + 1) }; + new ItemStack(HTGRMaterials.aHTGR_Materials, toReduce, meta + 1) }; if (!this.canOutputAll(toOutput)) return false; this.fuelsupply -= originalToReduce; @@ -326,9 +320,9 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase } if (this.fuelsupply > 0) { ItemStack iStack = new ItemStack( - HTGRMaterials.aHTGR_Materials, - this.fuelsupply, - HTGRMaterials.MATERIALS_PER_FUEL * this.fueltype + HTGRMaterials.USABLE_FUEL_INDEX); + HTGRMaterials.aHTGR_Materials, + this.fuelsupply, + HTGRMaterials.MATERIALS_PER_FUEL * this.fueltype + HTGRMaterials.USABLE_FUEL_INDEX); boolean storedAll = false; for (GT_MetaTileEntity_Hatch_OutputBus tHatch : filterValidMTEs(mOutputBusses)) { if (tHatch.storeAll(iStack)) { @@ -408,34 +402,43 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase @Override public String[] getInfoData() { return new String[] { "Mode:", this.empty ? "Emptying" : "Normal", "Progress:", - GT_Utility.formatNumbers(this.mProgresstime / 20) + "s / " - + GT_Utility.formatNumbers(this.mMaxProgresstime / 20) - + "s", - "Fuel type:", - this.fueltype == -1 ? "NONE" : "TRISO (" + HTGRMaterials.sHTGR_Fuel[this.fueltype].sEnglish + ")", - "Fuel amount:", GT_Utility.formatNumbers(this.fuelsupply) + " pcs.", "Helium-Level:", - GT_Utility.formatNumbers(this.HeliumSupply) + "L / " - + GT_Utility.formatNumbers(GT_TileEntity_HTGR.HELIUM_NEEDED) - + "L", - "Coolant:", GT_Utility.formatNumbers(this.coolanttaking) + "L/s", "Problems:", - String.valueOf(this.getIdealStatus() - this.getRepairStatus()) }; + GT_Utility.formatNumbers(this.mProgresstime / 20) + "s / " + + GT_Utility.formatNumbers(this.mMaxProgresstime / 20) + + "s", + "Fuel type:", + this.fueltype == -1 ? "NONE" : "TRISO (" + HTGRMaterials.sHTGR_Fuel[this.fueltype].sEnglish + ")", + "Fuel amount:", GT_Utility.formatNumbers(this.fuelsupply) + " pcs.", "Helium-Level:", + GT_Utility.formatNumbers(this.HeliumSupply) + "L / " + + GT_Utility.formatNumbers(GT_TileEntity_HTGR.HELIUM_NEEDED) + + "L", + "Coolant:", GT_Utility.formatNumbers(this.coolanttaking) + "L/s", "Problems:", + String.valueOf(this.getIdealStatus() - this.getRepairStatus()) }; } @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, - ForgeDirection forgeDirection, int aColorIndex, boolean aActive, boolean aRedstone) { + ForgeDirection forgeDirection, int aColorIndex, boolean aActive, boolean aRedstone) { if (side == forgeDirection) { - if (aActive) - return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_HTGR.BASECASINGINDEX), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE) - .extFacing().build(), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW) - .extFacing().glow().build() }; + if (aActive) return new ITexture[] { + Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_HTGR.BASECASINGINDEX), TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_HTGR.BASECASINGINDEX), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER).extFacing() - .build(), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_GLOW).extFacing() - .glow().build() }; + TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_HTGR.BASECASINGINDEX) }; } @@ -448,8 +451,8 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase } this.empty = !this.empty; GT_Utility.sendChatToPlayer( - aPlayer, - "HTGR is now running in " + (this.empty ? "emptying mode." : "normal Operation")); + aPlayer, + "HTGR is now running in " + (this.empty ? "emptying mode." : "normal Operation")); } @Override @@ -496,13 +499,13 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase public ItemStack mainItem; public ItemStack secondaryItem; public ItemStack[] recycledItems = { GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, - GT_Values.NI }; + GT_Values.NI }; public FluidStack recycledFluid; public int[] recycleChances; public String tooltip; public Fuel_(String sName, String sEnglish, ItemStack mainItem, ItemStack secondaryItem, - FluidStack recycledFluid, ItemStack[] recycledItems, int[] recycleChances, String tooltip) { + FluidStack recycledFluid, ItemStack[] recycledItems, int[] recycleChances, String tooltip) { this.sName = sName; this.sEnglish = sEnglish; this.mainItem = mainItem; @@ -526,46 +529,43 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase } public static final Base_[] sHTGR_Bases = { new Base_("HTGRFuelMixture", "HTGR fuel mixture"), - new Base_("BISOPebbleCompound", "BISO pebble compound"), - new Base_("TRISOPebbleCompound", "TRISO pebble compound"), new Base_("TRISOBall", "TRISO ball"), - new Base_("TRISOPebble", "TRISO pebble"), new Base_("BurnedOutTRISOBall", "Burned out TRISO Ball"), - new Base_("BurnedOutTRISOPebble", "Burned out TRISO Pebble"), }; + new Base_("BISOPebbleCompound", "BISO pebble compound"), + new Base_("TRISOPebbleCompound", "TRISO pebble compound"), new Base_("TRISOBall", "TRISO ball"), + new Base_("TRISOPebble", "TRISO pebble"), new Base_("BurnedOutTRISOBall", "Burned out TRISO Ball"), + new Base_("BurnedOutTRISOPebble", "Burned out TRISO Pebble"), }; public static final int MATERIALS_PER_FUEL = sHTGR_Bases.length; static final int USABLE_FUEL_INDEX = 4; static final int BURNED_OUT_FUEL_INDEX = 5; - public static final Fuel_[] sHTGR_Fuel = { - new Fuel_( - "Thorium", - "Thorium", - WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 64), - Materials.Uranium235.getDust(4), - GT_Values.NF, - new ItemStack[] { Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), - Materials.Carbon.getDust(1), Materials.Lutetium.getDust(1), - WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1) }, - new int[] { 9900 / 4, 9900 / 4, 9900 / 4, 9900 / 4, 162 / 4 }, - "Multiplies coolant by 1"), - new Fuel_( - "Uranium", - "Uranium", - Materials.Uranium.getDust(64), - Materials.Uranium235.getDust(8), - FluidRegistry.getFluidStack("krypton", 4), - new ItemStack[] { Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), - Materials.Carbon.getDust(1), Materials.Lead.getDust(1), Materials.Uranium.getDust(1) }, - new int[] { 9900 / 4, 9900 / 4, 9900 / 4, 5000 / 4, 5000 / 4 }, - "Multiplies coolant by 1.5"), - new Fuel_( - "Plutonium", - "Plutonium", - Materials.Plutonium.getDust(64), - Materials.Plutonium241.getDust(4), - FluidRegistry.getFluidStack("xenon", 4), - new ItemStack[] { Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), - Materials.Carbon.getDust(1), Materials.Lead.getDust(1), - Materials.Plutonium.getDust(1) }, - new int[] { 9900 / 4, 9900 / 4, 9900 / 4, 5000 / 4, 5000 / 4 }, - "Multiplies coolant by 2"), }; + public static final Fuel_[] sHTGR_Fuel = { new Fuel_( + "Thorium", + "Thorium", + WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 64), + Materials.Uranium235.getDust(4), + GT_Values.NF, + new ItemStack[] { Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), Materials.Carbon.getDust(1), + Materials.Lutetium.getDust(1), WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1) }, + new int[] { 9900 / 4, 9900 / 4, 9900 / 4, 9900 / 4, 162 / 4 }, + "Multiplies coolant by 1"), + new Fuel_( + "Uranium", + "Uranium", + Materials.Uranium.getDust(64), + Materials.Uranium235.getDust(8), + FluidRegistry.getFluidStack("krypton", 4), + new ItemStack[] { Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), + Materials.Carbon.getDust(1), Materials.Lead.getDust(1), Materials.Uranium.getDust(1) }, + new int[] { 9900 / 4, 9900 / 4, 9900 / 4, 5000 / 4, 5000 / 4 }, + "Multiplies coolant by 1.5"), + new Fuel_( + "Plutonium", + "Plutonium", + Materials.Plutonium.getDust(64), + Materials.Plutonium241.getDust(4), + FluidRegistry.getFluidStack("xenon", 4), + new ItemStack[] { Materials.Silicon.getDust(1), Materials.Graphite.getDust(1), + Materials.Carbon.getDust(1), Materials.Lead.getDust(1), Materials.Plutonium.getDust(1) }, + new int[] { 9900 / 4, 9900 / 4, 9900 / 4, 5000 / 4, 5000 / 4 }, + "Multiplies coolant by 2"), }; public static final CustomHTGRSimpleSubItemClass aHTGR_Materials; static final ArrayList<LangEntry_> aHTGR_Localizations = new ArrayList<>(); @@ -576,12 +576,9 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase for (Fuel_ fuel : sHTGR_Fuel) for (Base_ base : sHTGR_Bases) { sHTGR_Materials[i] = "HTGR" + base.sName + fuel.sName; aHTGR_Localizations.add( - new LangEntry_( - "item." + sHTGR_Materials[i] + ".name", - base.sEnglish + " (" + fuel.sEnglish + ")")); + new LangEntry_("item." + sHTGR_Materials[i] + ".name", base.sEnglish + " (" + fuel.sEnglish + ")")); if ((i + 1) % MATERIALS_PER_FUEL == USABLE_FUEL_INDEX + 1 && fuel.tooltip != null - && !fuel.tooltip.isEmpty()) - tooltip.put(i, fuel.tooltip); + && !fuel.tooltip.isEmpty()) tooltip.put(i, fuel.tooltip); i++; } aHTGR_Materials = new CustomHTGRSimpleSubItemClass(tooltip, sHTGR_Materials); @@ -600,15 +597,15 @@ public class GT_TileEntity_HTGR extends GT_MetaTileEntity_EnhancedMultiBlockBase Fuel_ fuel : sHTGR_Fuel) { BartWorksRecipeMaps.htgrFakeRecipes.addFakeRecipe( - false, - new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4) }, - new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 5) }, - null, - null, - null, - 72000, - powerUsage, - 0); + false, + new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4) }, + new ItemStack[] { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 5) }, + null, + null, + null, + 72000, + powerUsage, + 0); i += MATERIALS_PER_FUEL; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_LESU.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_LESU.java index 65a45051ab..5a2c3ba382 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_LESU.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_LESU.java @@ -110,8 +110,10 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { @Override public long maxAmperesIn() { int ret = 0; - for (int i = 0; i < 5; ++i) if (this.circuits[i] != null - && this.circuits[i].getItem().equals(GT_Utility.getIntegratedCircuit(0).getItem())) + for (int i = 0; i < 5; ++i) if (this.circuits[i] != null && this.circuits[i].getItem() + .equals( + GT_Utility.getIntegratedCircuit(0) + .getItem())) ret += this.circuits[i].getItemDamage(); return ret > 0 ? ret : 1; } @@ -170,13 +172,15 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { @Override public String[] getDescription() { ArrayList<String> e = new ArrayList<>(); - String[] dsc = StatCollector.translateToLocal("tooltip.tile.lesu.0.name").split(";"); + String[] dsc = StatCollector.translateToLocal("tooltip.tile.lesu.0.name") + .split(";"); Collections.addAll(e, dsc); e.add( - StatCollector.translateToLocal("tooltip.tile.lesu.1.name") + " " - + GT_Utility.formatNumbers(ConfigHandler.energyPerCell) - + "EU"); - dsc = StatCollector.translateToLocal("tooltip.tile.lesu.2.name").split(";"); + StatCollector.translateToLocal("tooltip.tile.lesu.1.name") + " " + + GT_Utility.formatNumbers(ConfigHandler.energyPerCell) + + "EU"); + dsc = StatCollector.translateToLocal("tooltip.tile.lesu.2.name") + .split(";"); Collections.addAll(e, dsc); e.add(ChatColorHelper.RED + StatCollector.translateToLocal("tooltip.tile.lesu.3.name")); e.add(BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); @@ -211,15 +215,17 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { } public boolean isClientSide() { - if (this.getWorld() != null) - return this.getWorld().isRemote ? FMLCommonHandler.instance().getSide() == Side.CLIENT - : FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT; - return FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT; + if (this.getWorld() != null) return this.getWorld().isRemote ? FMLCommonHandler.instance() + .getSide() == Side.CLIENT + : FMLCommonHandler.instance() + .getEffectiveSide() == Side.CLIENT; + return FMLCommonHandler.instance() + .getEffectiveSide() == Side.CLIENT; } @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { ITexture[] ret = {}; @@ -227,11 +233,11 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { for (int i = 0; i < GT_TileEntity_LESU.iTextures.length; i++) { GT_TileEntity_LESU.iTextures[i][0] = TextureFactory - .of(GT_TileEntity_LESU.iIconContainers[i], Dyes.getModulation(0, Dyes.MACHINE_METAL.mRGBa)); + .of(GT_TileEntity_LESU.iIconContainers[i], Dyes.getModulation(0, Dyes.MACHINE_METAL.mRGBa)); } - if (side == facing && this.getBaseMetaTileEntity().getUniversalEnergyStored() <= 0) - ret = GT_TileEntity_LESU.iTextures[GT_TileEntity_LESU.TEXID_EMPTY]; + if (side == facing && this.getBaseMetaTileEntity() + .getUniversalEnergyStored() <= 0) ret = GT_TileEntity_LESU.iTextures[GT_TileEntity_LESU.TEXID_EMPTY]; else if (side == facing && !aActive) ret = GT_TileEntity_LESU.iTextures[GT_TileEntity_LESU.TEXID_IDLE]; else if (side == facing && aActive) ret = GT_TileEntity_LESU.iTextures[GT_TileEntity_LESU.TEXID_CHARGING]; else ret = GT_TileEntity_LESU.iTextures[GT_TileEntity_LESU.TEXID_SIDE]; @@ -292,7 +298,10 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { return switch (index) { case 0, 1 -> true; - default -> stack != null && stack.getItem().equals(GT_Utility.getIntegratedCircuit(0).getItem()); + default -> stack != null && stack.getItem() + .equals( + GT_Utility.getIntegratedCircuit(0) + .getItem()); }; } @@ -308,12 +317,14 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { @Override public boolean isInputFacing(ForgeDirection side) { - return side != this.getBaseMetaTileEntity().getFrontFacing(); + return side != this.getBaseMetaTileEntity() + .getFrontFacing(); } @Override public boolean isOutputFacing(ForgeDirection side) { - return side == this.getBaseMetaTileEntity().getFrontFacing(); + return side == this.getBaseMetaTileEntity() + .getFrontFacing(); } @Override @@ -367,20 +378,23 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { long startingTime = System.nanoTime(); this.connectedcells = new ConnectedBlocksChecker(); this.connectedcells.get_connected( - aBaseMetaTileEntity.getWorld(), - aBaseMetaTileEntity.getXCoord(), - aBaseMetaTileEntity.getYCoord(), - aBaseMetaTileEntity.getZCoord(), - ItemRegistry.BW_BLOCKS[1]); + aBaseMetaTileEntity.getWorld(), + aBaseMetaTileEntity.getXCoord(), + aBaseMetaTileEntity.getYCoord(), + aBaseMetaTileEntity.getZCoord(), + ItemRegistry.BW_BLOCKS[1]); if (this.connectedcells.get_meta_of_sideblocks( - aBaseMetaTileEntity.getWorld(), - this.getBaseMetaTileEntity().getMetaTileID(), - new int[] { aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), - aBaseMetaTileEntity.getZCoord() }, - true)) { - this.getBaseMetaTileEntity().disableWorking(); - this.getBaseMetaTileEntity().setActive(false); + aBaseMetaTileEntity.getWorld(), + this.getBaseMetaTileEntity() + .getMetaTileID(), + new int[] { aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), + aBaseMetaTileEntity.getZCoord() }, + true)) { + this.getBaseMetaTileEntity() + .disableWorking(); + this.getBaseMetaTileEntity() + .setActive(false); this.mStorage = 0; this.mMaxProgresstime = 0; this.mProgresstime = 0; @@ -389,8 +403,8 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { this.mEfficiency = this.getMaxEfficiency(null); this.mStorage = ConfigHandler.energyPerCell * this.connectedcells.hashset.size() >= Long.MAX_VALUE - 1 - || ConfigHandler.energyPerCell * this.connectedcells.hashset.size() < 0 ? Long.MAX_VALUE - 1 - : ConfigHandler.energyPerCell * this.connectedcells.hashset.size(); + || ConfigHandler.energyPerCell * this.connectedcells.hashset.size() < 0 ? Long.MAX_VALUE - 1 + : ConfigHandler.energyPerCell * this.connectedcells.hashset.size(); this.mMaxProgresstime = 1; this.mProgresstime = 0; @@ -401,25 +415,32 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { this.mSolderingTool = true; this.mWrench = true; - this.getBaseMetaTileEntity().enableWorking(); - this.getBaseMetaTileEntity().setActive(true); + this.getBaseMetaTileEntity() + .enableWorking(); + this.getBaseMetaTileEntity() + .setActive(true); long finishedTime = System.nanoTime(); // System.out.println("LESU LookUp: "+((finishedTime - startingTime) / 1000000)+"ms"); if (finishedTime - startingTime > 5000000) MainMod.LOGGER.warn( - "LESU LookUp took longer than 5ms!(" + (finishedTime - startingTime) - + "ns / " - + (finishedTime - startingTime) / 1000000 - + "ms) Owner:" - + this.getBaseMetaTileEntity().getOwnerName() - + " Check at x:" - + this.getBaseMetaTileEntity().getXCoord() - + " y:" - + this.getBaseMetaTileEntity().getYCoord() - + " z:" - + this.getBaseMetaTileEntity().getZCoord() - + " DIM-ID: " - + this.getBaseMetaTileEntity().getWorld().provider.dimensionId); + "LESU LookUp took longer than 5ms!(" + (finishedTime - startingTime) + + "ns / " + + (finishedTime - startingTime) / 1000000 + + "ms) Owner:" + + this.getBaseMetaTileEntity() + .getOwnerName() + + " Check at x:" + + this.getBaseMetaTileEntity() + .getXCoord() + + " y:" + + this.getBaseMetaTileEntity() + .getYCoord() + + " z:" + + this.getBaseMetaTileEntity() + .getZCoord() + + " DIM-ID: " + + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId); return true; } @@ -444,40 +465,53 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { } public World getWorld() { - return this.getBaseMetaTileEntity().getWorld(); + return this.getBaseMetaTileEntity() + .getWorld(); } @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY).setSize(17, 17) - .setPos(105, 51)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY) + .setSize(17, 17) + .setPos(105, 51)); } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(7, 4).setSize(118, 67)) - .widget(new SlotWidget(new BaseSlot(this.inventoryHandler, 1) { - - @Override - public int getSlotStackLimit() { - return 1; - } - }).setBackground(this.getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN).setPos(127, 13)) - .widget(new SlotWidget(new BaseSlot(this.inventoryHandler, 0) { - - @Override - public int getSlotStackLimit() { - return 1; - } - }).setBackground(this.getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CHARGER) - .setPos(127, 49)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + .setPos(7, 4) + .setSize(118, 67)) + .widget(new SlotWidget(new BaseSlot(this.inventoryHandler, 1) { + + @Override + public int getSlotStackLimit() { + return 1; + } + }).setBackground( + this.getGUITextureSet() + .getItemSlot(), + GT_UITextures.OVERLAY_SLOT_IN) + .setPos(127, 13)) + .widget(new SlotWidget(new BaseSlot(this.inventoryHandler, 0) { + + @Override + public int getSlotStackLimit() { + return 1; + } + }).setBackground( + this.getGUITextureSet() + .getItemSlot(), + GT_UITextures.OVERLAY_SLOT_CHARGER) + .setPos(127, 49)); for (int i = 0; i < 4; i++) { builder.widget( - new SlotWidget(this.circuitsInventoryHandler, i).setBackground( - this.getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_INT_CIRCUIT).setPos(151, 4 + i * 18)); + new SlotWidget(this.circuitsInventoryHandler, i).setBackground( + this.getGUITextureSet() + .getItemSlot(), + GT_UITextures.OVERLAY_SLOT_INT_CIRCUIT) + .setPos(151, 4 + i * 18)); } final DynamicPositionedColumn screenElements = new DynamicPositionedColumn(); @@ -485,15 +519,18 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { builder.widget(screenElements); builder.widget( - new DrawableWidget().setDrawable(BW_UITextures.PICTURE_STORED_EU_FRAME).setPos(7, 72).setSize(118, 7)) - .widget( - new ProgressBar() - .setProgress( - () -> (float) this.getBaseMetaTileEntity().getStoredEU() - / this.getBaseMetaTileEntity().getEUCapacity()) - .setDirection(ProgressBar.Direction.RIGHT) - .setTexture(BW_UITextures.PROGRESSBAR_STORED_EU_116, 116).setPos(8, 73) - .setSize(116, 5)); + new DrawableWidget().setDrawable(BW_UITextures.PICTURE_STORED_EU_FRAME) + .setPos(7, 72) + .setSize(118, 7)) + .widget( + new ProgressBar().setProgress( + () -> (float) this.getBaseMetaTileEntity() + .getStoredEU() / this.getBaseMetaTileEntity() + .getEUCapacity()) + .setDirection(ProgressBar.Direction.RIGHT) + .setTexture(BW_UITextures.PROGRESSBAR_STORED_EU_116, 116) + .setPos(8, 73) + .setSize(116, 5)); } private long clientEU; @@ -503,51 +540,59 @@ public class GT_TileEntity_LESU extends GT_MetaTileEntity_MultiBlockBase { private long clientAmps; private void drawTexts(DynamicPositionedColumn screenElements) { - screenElements.setSpace(0).setPos(11, 8); - - screenElements - .widget( - new TextWidget().setStringSupplier(() -> "EU: " + numberFormat.format(this.clientEU)) - .setDefaultColor(this.COLOR_TEXT_WHITE.get())) - .widget( - new FakeSyncWidget.LongSyncer( - () -> this.getBaseMetaTileEntity().getStoredEU(), - val -> clientEU = val)) - .widget( - new TextWidget().setStringSupplier(() -> "MAX: " + numberFormat.format(clientMaxEU)) - .setDefaultColor(this.COLOR_TEXT_WHITE.get())) - .widget( - new FakeSyncWidget.LongSyncer( - () -> this.getBaseMetaTileEntity().isActive() - ? this.getBaseMetaTileEntity().getOutputVoltage() * ConfigHandler.energyPerCell - : 0, - val -> clientMaxEU = val)) - .widget( - new TextWidget().setStringSupplier(() -> "MAX EU/t IN: " + numberFormat.format(clientMaxIn)) - .setDefaultColor(this.COLOR_TEXT_WHITE.get())) - .widget( - new FakeSyncWidget.LongSyncer( - () -> this.getBaseMetaTileEntity().getInputVoltage(), - val -> clientMaxIn = val)) - .widget( - new TextWidget().setStringSupplier(() -> "EU/t OUT: " + numberFormat.format(clientMaxOut)) - .setDefaultColor(this.COLOR_TEXT_WHITE.get())) - .widget( - new FakeSyncWidget.LongSyncer( - () -> this.getBaseMetaTileEntity().getOutputVoltage(), - val -> clientMaxOut = val)) - .widget( - new TextWidget().setStringSupplier(() -> "AMP/t IN/OUT: " + numberFormat.format(clientAmps)) - .setDefaultColor(this.COLOR_TEXT_WHITE.get())) - .widget( - new FakeSyncWidget.LongSyncer( - () -> this.getBaseMetaTileEntity().getInputAmperage(), - val -> clientAmps = val)) - .widget( - new TextWidget(Text.localised("tooltip.LESU.0.name")).setDefaultColor(Color.YELLOW.getRGB()) - .setEnabled(widget -> this.maxEUStore() >= Long.MAX_VALUE - 1)) - .widget( - new TextWidget(Text.localised("tooltip.LESU.1.name")).setDefaultColor(Color.RED.getRGB()) - .setEnabled(widget -> !this.getBaseMetaTileEntity().isActive())); + screenElements.setSpace(0) + .setPos(11, 8); + + screenElements.widget( + new TextWidget().setStringSupplier(() -> "EU: " + numberFormat.format(this.clientEU)) + .setDefaultColor(this.COLOR_TEXT_WHITE.get())) + .widget( + new FakeSyncWidget.LongSyncer( + () -> this.getBaseMetaTileEntity() + .getStoredEU(), + val -> clientEU = val)) + .widget( + new TextWidget().setStringSupplier(() -> "MAX: " + numberFormat.format(clientMaxEU)) + .setDefaultColor(this.COLOR_TEXT_WHITE.get())) + .widget( + new FakeSyncWidget.LongSyncer( + () -> this.getBaseMetaTileEntity() + .isActive() + ? this.getBaseMetaTileEntity() + .getOutputVoltage() * ConfigHandler.energyPerCell + : 0, + val -> clientMaxEU = val)) + .widget( + new TextWidget().setStringSupplier(() -> "MAX EU/t IN: " + numberFormat.format(clientMaxIn)) + .setDefaultColor(this.COLOR_TEXT_WHITE.get())) + .widget( + new FakeSyncWidget.LongSyncer( + () -> this.getBaseMetaTileEntity() + .getInputVoltage(), + val -> clientMaxIn = val)) + .widget( + new TextWidget().setStringSupplier(() -> "EU/t OUT: " + numberFormat.format(clientMaxOut)) + .setDefaultColor(this.COLOR_TEXT_WHITE.get())) + .widget( + new FakeSyncWidget.LongSyncer( + () -> this.getBaseMetaTileEntity() + .getOutputVoltage(), + val -> clientMaxOut = val)) + .widget( + new TextWidget().setStringSupplier(() -> "AMP/t IN/OUT: " + numberFormat.format(clientAmps)) + .setDefaultColor(this.COLOR_TEXT_WHITE.get())) + .widget( + new FakeSyncWidget.LongSyncer( + () -> this.getBaseMetaTileEntity() + .getInputAmperage(), + val -> clientAmps = val)) + .widget( + new TextWidget(Text.localised("tooltip.LESU.0.name")).setDefaultColor(Color.YELLOW.getRGB()) + .setEnabled(widget -> this.maxEUStore() >= Long.MAX_VALUE - 1)) + .widget( + new TextWidget(Text.localised("tooltip.LESU.1.name")).setDefaultColor(Color.RED.getRGB()) + .setEnabled( + widget -> !this.getBaseMetaTileEntity() + .isActive())); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ManualTrafo.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ManualTrafo.java index 6c8f5e8b76..b481429411 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ManualTrafo.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ManualTrafo.java @@ -70,56 +70,57 @@ public class GT_TileEntity_ManualTrafo extends GT_MetaTileEntity_EnhancedMultiBl private static final String STRUCTURE_PIECE_TOP = "top"; private static final String STRUCTURE_PIECE_TAP_LAYER = "taplayer"; private static final IStructureDefinition<GT_TileEntity_ManualTrafo> STRUCTURE_DEFINITION = StructureDefinition - .<GT_TileEntity_ManualTrafo>builder() - .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] { { "b~b", "bbb", "bbb" } })) - .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] { { "ttt", "tft", "ttt" } })) - .addShape(STRUCTURE_PIECE_TOP, transpose(new String[][] { { "ooo", "ooo", "ooo" } })) - .addShape( - STRUCTURE_PIECE_TAP_LAYER, - transpose(new String[][] { { " TTT ", "TtttT", "TtftT", "TtttT", " TTT " } })) - .addElement( - 'b', - ofChain( - ofHatchAdder(GT_TileEntity_ManualTrafo::addEnergyInputToMachineList, CASING_INDEX, 1), - ofHatchAdder(GT_TileEntity_ManualTrafo::addMaintenanceToMachineList, CASING_INDEX, 1), - ofBlock(GregTech_API.sBlockCasings1, 2))) - .addElement( - 'o', - ofHatchAdderOptional( - GT_TileEntity_ManualTrafo::addDynamoToMachineList, - CASING_INDEX, - 2, - GregTech_API.sBlockCasings1, - 2)) - .addElement('t', ofBlock(BW_BLOCKS[2], 1)).addElement('f', ofBlock(BW_BLOCKS[2], 0)) - .addElement('T', new IStructureElementNoPlacement<GT_TileEntity_ManualTrafo>() { - - @Override - public boolean check(GT_TileEntity_ManualTrafo te, World world, int x, int y, int z) { - if (world.isAirBlock(x, y, z)) return true; - TileEntity tileEntity = world.getTileEntity(x, y, z); - if (tileEntity == null || !(tileEntity instanceof IGregTechTileEntity)) return true; - IMetaTileEntity mte = ((IGregTechTileEntity) tileEntity).getMetaTileEntity(); - if (mte instanceof GT_MetaTileEntity_Hatch_Dynamo - || mte instanceof GT_MetaTileEntity_Hatch_Energy) { - int intier = te.mEnergyHatches.get(0).mTier; - if (((GT_MetaTileEntity_TieredMachineBlock) mte).mTier - == intier + (te.upstep ? te.mTiers : -te.mTiers)) { - te.addToMachineList((IGregTechTileEntity) tileEntity, CASING_INDEX); - return true; - } - return false; + .<GT_TileEntity_ManualTrafo>builder() + .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] { { "b~b", "bbb", "bbb" } })) + .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] { { "ttt", "tft", "ttt" } })) + .addShape(STRUCTURE_PIECE_TOP, transpose(new String[][] { { "ooo", "ooo", "ooo" } })) + .addShape( + STRUCTURE_PIECE_TAP_LAYER, + transpose(new String[][] { { " TTT ", "TtttT", "TtftT", "TtttT", " TTT " } })) + .addElement( + 'b', + ofChain( + ofHatchAdder(GT_TileEntity_ManualTrafo::addEnergyInputToMachineList, CASING_INDEX, 1), + ofHatchAdder(GT_TileEntity_ManualTrafo::addMaintenanceToMachineList, CASING_INDEX, 1), + ofBlock(GregTech_API.sBlockCasings1, 2))) + .addElement( + 'o', + ofHatchAdderOptional( + GT_TileEntity_ManualTrafo::addDynamoToMachineList, + CASING_INDEX, + 2, + GregTech_API.sBlockCasings1, + 2)) + .addElement('t', ofBlock(BW_BLOCKS[2], 1)) + .addElement('f', ofBlock(BW_BLOCKS[2], 0)) + .addElement('T', new IStructureElementNoPlacement<GT_TileEntity_ManualTrafo>() { + + @Override + public boolean check(GT_TileEntity_ManualTrafo te, World world, int x, int y, int z) { + if (world.isAirBlock(x, y, z)) return true; + TileEntity tileEntity = world.getTileEntity(x, y, z); + if (tileEntity == null || !(tileEntity instanceof IGregTechTileEntity)) return true; + IMetaTileEntity mte = ((IGregTechTileEntity) tileEntity).getMetaTileEntity(); + if (mte instanceof GT_MetaTileEntity_Hatch_Dynamo || mte instanceof GT_MetaTileEntity_Hatch_Energy) { + int intier = te.mEnergyHatches.get(0).mTier; + if (((GT_MetaTileEntity_TieredMachineBlock) mte).mTier + == intier + (te.upstep ? te.mTiers : -te.mTiers)) { + te.addToMachineList((IGregTechTileEntity) tileEntity, CASING_INDEX); + return true; } - return true; + return false; } + return true; + } - @Override - public boolean spawnHint(GT_TileEntity_ManualTrafo te, World world, int x, int y, int z, - ItemStack itemStack) { - StructureLibAPI.hintParticle(world, x, y, z, StructureLibAPI.getBlockHint(), 2 /* aDots: 3 */); - return true; - } - }).build(); + @Override + public boolean spawnHint(GT_TileEntity_ManualTrafo te, World world, int x, int y, int z, + ItemStack itemStack) { + StructureLibAPI.hintParticle(world, x, y, z, StructureLibAPI.getBlockHint(), 2 /* aDots: 3 */); + return true; + } + }) + .build(); @Override public IStructureDefinition<GT_TileEntity_ManualTrafo> getStructureDefinition() { @@ -129,21 +130,27 @@ public class GT_TileEntity_ManualTrafo extends GT_MetaTileEntity_EnhancedMultiBl @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Transformer").addInfo("Controller block for the Manual Trafo") - .addInfo("Operates in 4 diffrent modes:").addInfo("Mode 1: Circuit 0 in controller: Direct-Upstep") - .addInfo("Mode 2: Circuit 1 in controller: Direct-Downstep") - .addInfo("Mode 3: Circuit 2 in controller: Tapped-Upstep (currently disabled)") - .addInfo("Mode 4: Circuit 2 in controller: Tapped-Downstep (currently disabled)").addSeparator() - .beginVariableStructureBlock(3, 3, 3, 10, 3, 3, false).addController("Front bottom center") - .addCasingInfoMin("MV Machine Casing", 0, false) - .addOtherStructurePart("Transformer-Winding Blocks", "1 Layer for each tier transformed") - .addOtherStructurePart("Nickel-Zinc-Ferrite Blocks", "Middle of Transformer-Winding Blocks") - .addMaintenanceHatch("Any bottom layer casing", 1).addEnergyHatch("Any bottom layer casing", 1) - .addDynamoHatch("Any top layer casing", 2).addStructureInfo("---------TAPPED MODE---------") - .addEnergyHatch("Touching Transformer-Winding Blocks", 3) - .addDynamoHatch("Touching Transformer-Winding Blocks", 3) - .addStructureInfo("Hatches touching Transformer-Winding Blocks must be tiered from bottom to top") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + tt.addMachineType("Transformer") + .addInfo("Controller block for the Manual Trafo") + .addInfo("Operates in 4 diffrent modes:") + .addInfo("Mode 1: Circuit 0 in controller: Direct-Upstep") + .addInfo("Mode 2: Circuit 1 in controller: Direct-Downstep") + .addInfo("Mode 3: Circuit 2 in controller: Tapped-Upstep (currently disabled)") + .addInfo("Mode 4: Circuit 2 in controller: Tapped-Downstep (currently disabled)") + .addSeparator() + .beginVariableStructureBlock(3, 3, 3, 10, 3, 3, false) + .addController("Front bottom center") + .addCasingInfoMin("MV Machine Casing", 0, false) + .addOtherStructurePart("Transformer-Winding Blocks", "1 Layer for each tier transformed") + .addOtherStructurePart("Nickel-Zinc-Ferrite Blocks", "Middle of Transformer-Winding Blocks") + .addMaintenanceHatch("Any bottom layer casing", 1) + .addEnergyHatch("Any bottom layer casing", 1) + .addDynamoHatch("Any top layer casing", 2) + .addStructureInfo("---------TAPPED MODE---------") + .addEnergyHatch("Touching Transformer-Winding Blocks", 3) + .addDynamoHatch("Touching Transformer-Winding Blocks", 3) + .addStructureInfo("Hatches touching Transformer-Winding Blocks must be tiered from bottom to top") + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); return tt; } @@ -154,13 +161,15 @@ public class GT_TileEntity_ManualTrafo extends GT_MetaTileEntity_EnhancedMultiBl @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if (!this.getBaseMetaTileEntity().isAllowedToWork()) this.stopMachine(); + if (!this.getBaseMetaTileEntity() + .isAllowedToWork()) this.stopMachine(); super.onPostTick(aBaseMetaTileEntity, aTick); } @Override public boolean onRunningTick(ItemStack aStack) { - if (!this.getBaseMetaTileEntity().isAllowedToWork()) { + if (!this.getBaseMetaTileEntity() + .isAllowedToWork()) { this.stopMachine(); return false; } @@ -168,16 +177,16 @@ public class GT_TileEntity_ManualTrafo extends GT_MetaTileEntity_EnhancedMultiBl this.mProgresstime = 0; this.mMaxProgresstime = 1; - if (this.getBaseMetaTileEntity().getTimer() % 40 == 0) - if (this.mEfficiency < this.getMaxEfficiency(null)) this.mEfficiency += 100; - else this.mEfficiency = this.getMaxEfficiency(null); + if (this.getBaseMetaTileEntity() + .getTimer() % 40 == 0) if (this.mEfficiency < this.getMaxEfficiency(null)) this.mEfficiency += 100; + else this.mEfficiency = this.getMaxEfficiency(null); if (this.mode > 1) { return false; // this.onRunningTickTabbedMode(); Tapped mode is disable } return this.drainEnergyInput(this.getInputTier() * 2 * this.mEnergyHatches.size()) && this.addEnergyOutput( - this.getInputTier() * 2 * this.mEnergyHatches.size() * this.mEfficiency / this.getMaxEfficiency(null)); + this.getInputTier() * 2 * this.mEnergyHatches.size() * this.mEfficiency / this.getMaxEfficiency(null)); } public boolean onRunningTickTabbedMode() { @@ -201,39 +210,46 @@ public class GT_TileEntity_ManualTrafo extends GT_MetaTileEntity_EnhancedMultiBl @Override public long getInputTier() { - if (this.mEnergyHatches.size() > 0) - return GT_Utility.getTier(this.mEnergyHatches.get(0).getBaseMetaTileEntity().getInputVoltage()); + if (this.mEnergyHatches.size() > 0) return GT_Utility.getTier( + this.mEnergyHatches.get(0) + .getBaseMetaTileEntity() + .getInputVoltage()); return 0L; } @Override public long getOutputTier() { - if (this.mDynamoHatches.size() > 0) - return GT_Utility.getTier(this.mDynamoHatches.get(0).getBaseMetaTileEntity().getOutputVoltage()); + if (this.mDynamoHatches.size() > 0) return GT_Utility.getTier( + this.mDynamoHatches.get(0) + .getBaseMetaTileEntity() + .getOutputVoltage()); return 0L; } @Override public boolean checkRecipe(ItemStack itemStack) { - if (!this.getBaseMetaTileEntity().isAllowedToWork()) { + if (!this.getBaseMetaTileEntity() + .isAllowedToWork()) { this.stopMachine(); return false; } - if (itemStack == null || !itemStack.getUnlocalizedName().startsWith("gt.integrated_circuit")) this.mode = 0; + if (itemStack == null || !itemStack.getUnlocalizedName() + .startsWith("gt.integrated_circuit")) this.mode = 0; else this.mode = (byte) Math.min(3, itemStack.getItemDamage()); this.upstep = this.mode % 2 == 0; this.mProgresstime = 0; this.mMaxProgresstime = 1; this.mEfficiency = Math.max(this.mEfficiency, 100); return this.upstep ? this.getOutputTier() - this.getInputTier() == this.mTiers - : this.getInputTier() - this.getOutputTier() == this.mTiers; + : this.getInputTier() - this.getOutputTier() == this.mTiers; } @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack itemStack) { - if (itemStack == null || !itemStack.getUnlocalizedName().startsWith("gt.integrated_circuit")) this.mode = 0; + if (itemStack == null || !itemStack.getUnlocalizedName() + .startsWith("gt.integrated_circuit")) this.mode = 0; else this.mode = (byte) Math.min(3, itemStack.getItemDamage()); this.upstep = this.mode % 2 == 0; @@ -307,24 +323,35 @@ public class GT_TileEntity_ManualTrafo extends GT_MetaTileEntity_EnhancedMultiBl @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW).extFacing() - .glow().build() }; - return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW).extFacing().glow() - .build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX) }; } @Override public void construct(ItemStack itemStack, boolean b) { - if (this.mInventory[1] == null || !this.mInventory[1].getUnlocalizedName().startsWith("gt.integrated_circuit")) - this.mode = 0; + if (this.mInventory[1] == null || !this.mInventory[1].getUnlocalizedName() + .startsWith("gt.integrated_circuit")) this.mode = 0; else this.mode = (byte) Math.min(3, this.mInventory[1].getItemDamage()); int mHeight = Math.min(itemStack.stackSize, 8); boolean tapmode = this.mode > 1; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java index 447f21281a..e7a2b090c9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java @@ -54,63 +54,51 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase private static final String STRUCTURE_PIECE_MAIN = "main"; private static final IStructureDefinition<GT_TileEntity_THTR> STRUCTURE_DEFINITION = StructureDefinition - .<GT_TileEntity_THTR>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { - { " BBBBBBB ", " BBBBBBBBB ", "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", - "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", " BBBBBBBBB ", - " BBBBBBB " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", - "c---------c", "c---------c", "c---------c", "c---------c", " c-------c ", - " ccccccc " }, - { " bbb~bbb ", " bbbbbbbbb ", "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", - "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", " bbbbbbbbb ", - " bbbbbbb " }, })) - .addElement('c', onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings3, 12))) - .addElement( - 'b', - ofChain( - ofHatchAdder(GT_TileEntity_THTR::addOutputToMachineList, BASECASINGINDEX, 1), - ofHatchAdder(GT_TileEntity_THTR::addMaintenanceToMachineList, BASECASINGINDEX, 1), - ofHatchAdder(GT_TileEntity_THTR::addEnergyInputToMachineList, BASECASINGINDEX, 1), - onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings3, 12)))) - .addElement( - 'B', - ofChain( - ofHatchAdder(GT_TileEntity_THTR::addInputToMachineList, BASECASINGINDEX, 2), - onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings3, 12)))) - // ofHatchAdderOptional(GT_TileEntity_THTR::addInputToMachineList, BASECASINGINDEX, 2, - // GregTech_API.sBlockCasings3, 12)) - .build(); + .<GT_TileEntity_THTR>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { + { " BBBBBBB ", " BBBBBBBBB ", "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", + "BBBBBBBBBBB", "BBBBBBBBBBB", "BBBBBBBBBBB", " BBBBBBBBB ", " BBBBBBB " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " ccccccc ", " c-------c ", "c---------c", "c---------c", "c---------c", "c---------c", + "c---------c", "c---------c", "c---------c", " c-------c ", " ccccccc " }, + { " bbb~bbb ", " bbbbbbbbb ", "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", + "bbbbbbbbbbb", "bbbbbbbbbbb", "bbbbbbbbbbb", " bbbbbbbbb ", " bbbbbbb " }, })) + .addElement('c', onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings3, 12))) + .addElement( + 'b', + ofChain( + ofHatchAdder(GT_TileEntity_THTR::addOutputToMachineList, BASECASINGINDEX, 1), + ofHatchAdder(GT_TileEntity_THTR::addMaintenanceToMachineList, BASECASINGINDEX, 1), + ofHatchAdder(GT_TileEntity_THTR::addEnergyInputToMachineList, BASECASINGINDEX, 1), + onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings3, 12)))) + .addElement( + 'B', + ofChain( + ofHatchAdder(GT_TileEntity_THTR::addInputToMachineList, BASECASINGINDEX, 2), + onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings3, 12)))) + // ofHatchAdderOptional(GT_TileEntity_THTR::addInputToMachineList, BASECASINGINDEX, 2, + // GregTech_API.sBlockCasings3, 12)) + .build(); private static final int HELIUM_NEEDED = 730000; private static final int powerUsage = (int) TierEU.RECIPE_IV / 2; @@ -144,21 +132,27 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("High Temperature Reactor") - .addInfo("Controller block for the Thorium High Temperature Reactor (THTR)") - .addInfo("Needs to be primed with " + GT_Utility.formatNumbers(HELIUM_NEEDED) + " of helium") - .addInfo("Needs a constant supply of coolant while running") - .addInfo("Needs at least 100k Fuel pebbles to start operation (can hold up to 675k pebbles)") - .addInfo("Consumes up to 0.5% of total Fuel Pellets per Operation depending on efficiency") - .addInfo("Efficiency decreases exponentially if the internal buffer is not completely filled") - .addInfo("Reactor will take 4 800L/t of coolant multiplied by efficiency") - .addInfo("Uses " + GT_Utility.formatNumbers(powerUsage) + " EU/t") - .addInfo("One Operation takes 9 hours").addSeparator().beginStructureBlock(11, 12, 11, true) - .addController("Front bottom center").addCasingInfoMin("Radiation Proof Casings", 500, false) - .addStructureInfo("Corners and the 2 touching blocks are air (cylindric)") - .addInputBus("Any top layer casing", 2).addInputHatch("Any top layer casing", 2) - .addOutputBus("Any bottom layer casing", 1).addOutputHatch("Any bottom layer casing", 1) - .addEnergyHatch("Any bottom layer casing", 1).addMaintenanceHatch("Any bottom layer casing", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + .addInfo("Controller block for the Thorium High Temperature Reactor (THTR)") + .addInfo("Needs to be primed with " + GT_Utility.formatNumbers(HELIUM_NEEDED) + " of helium") + .addInfo("Needs a constant supply of coolant while running") + .addInfo("Needs at least 100k Fuel pebbles to start operation (can hold up to 675k pebbles)") + .addInfo("Consumes up to 0.5% of total Fuel Pellets per Operation depending on efficiency") + .addInfo("Efficiency decreases exponentially if the internal buffer is not completely filled") + .addInfo("Reactor will take 4 800L/t of coolant multiplied by efficiency") + .addInfo("Uses " + GT_Utility.formatNumbers(powerUsage) + " EU/t") + .addInfo("One Operation takes 9 hours") + .addSeparator() + .beginStructureBlock(11, 12, 11, true) + .addController("Front bottom center") + .addCasingInfoMin("Radiation Proof Casings", 500, false) + .addStructureInfo("Corners and the 2 touching blocks are air (cylindric)") + .addInputBus("Any top layer casing", 2) + .addInputHatch("Any top layer casing", 2) + .addOutputBus("Any bottom layer casing", 1) + .addOutputHatch("Any bottom layer casing", 1) + .addEnergyHatch("Any bottom layer casing", 1) + .addMaintenanceHatch("Any bottom layer casing", 1) + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); return tt; } @@ -176,12 +170,12 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack itemStack) { this.mCasing = 0; return this.checkPiece(STRUCTURE_PIECE_MAIN, 5, 11, 0) && this.mCasing >= 500 - && this.mMaintenanceHatches.size() == 1 - && this.mInputHatches.size() > 0 - && this.mOutputHatches.size() > 0 - && this.mInputBusses.size() > 0 - && this.mOutputBusses.size() > 0 - && this.mEnergyHatches.size() > 0; + && this.mMaintenanceHatches.size() == 1 + && this.mInputHatches.size() > 0 + && this.mOutputHatches.size() > 0 + && this.mInputBusses.size() > 0 + && this.mOutputBusses.size() > 0 + && this.mEnergyHatches.size() > 0; } @Override @@ -221,8 +215,8 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase this.startRecipeProcessing(); for (ItemStack itemStack : this.getStoredInputs()) { if (GT_Utility.areStacksEqual( - itemStack, - new ItemStack(THTRMaterials.aTHTR_Materials, 1, THTRMaterials.MATERIAL_FUEL_INDEX))) { + itemStack, + new ItemStack(THTRMaterials.aTHTR_Materials, 1, THTRMaterials.MATERIAL_FUEL_INDEX))) { int toget = Math.min(maxcapacity - this.fuelsupply, itemStack.stackSize); if (toget == 0) continue; itemStack.stackSize -= toget; @@ -249,8 +243,8 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase if (this.HeliumSupply < GT_TileEntity_THTR.HELIUM_NEEDED || this.fuelsupply < mincapacity) return false; double eff = Math - .min(Math.pow((this.fuelsupply - mincapacity) / ((maxcapacity - mincapacity) / 10D), 2D) + 1, 100D) - / 100D - (this.getIdealStatus() - this.getRepairStatus()) / 10D; + .min(Math.pow((this.fuelsupply - mincapacity) / ((maxcapacity - mincapacity) / 10D), 2D) + 1, 100D) / 100D + - (this.getIdealStatus() - this.getRepairStatus()) / 10D; if (eff <= 0D) return false; int toReduce = MathUtils.floorInt(this.fuelsupply * 0.005D * eff); @@ -262,7 +256,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase int meta = THTRMaterials.MATERIAL_USED_FUEL_INDEX; ItemStack[] toOutput = { new ItemStack(THTRMaterials.aTHTR_Materials, burnedballs, meta), - new ItemStack(THTRMaterials.aTHTR_Materials, toReduce, meta + 1) }; + new ItemStack(THTRMaterials.aTHTR_Materials, toReduce, meta + 1) }; if (!this.canOutputAll(toOutput)) return false; this.fuelsupply -= originalToReduce; @@ -283,7 +277,7 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase if (this.empty) { this.addOutput(Materials.Helium.getGas(this.HeliumSupply)); this.addOutput( - new ItemStack(THTRMaterials.aTHTR_Materials, this.fuelsupply, THTRMaterials.MATERIAL_FUEL_INDEX)); + new ItemStack(THTRMaterials.aTHTR_Materials, this.fuelsupply, THTRMaterials.MATERIAL_FUEL_INDEX)); this.HeliumSupply = 0; this.fuelsupply = 0; this.updateSlots(); @@ -340,36 +334,43 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase @Override public String[] getInfoData() { return new String[] { "Progress:", - GT_Utility.formatNumbers(this.mProgresstime / 20) + "secs /" - + GT_Utility.formatNumbers(this.mMaxProgresstime / 20) - + "secs", - "TRISO-Pebbles:", - GT_Utility.formatNumbers(this.fuelsupply) + "pcs. / " - + GT_Utility.formatNumbers(this.fuelsupply) - + "psc.", - "Helium-Level:", - GT_Utility.formatNumbers(this.HeliumSupply) + "L / " - + GT_Utility.formatNumbers(GT_TileEntity_THTR.HELIUM_NEEDED) - + "L", - "Coolant/t:", GT_Utility.formatNumbers(this.mProgresstime == 0 ? 0 : this.coolanttaking) + "L/t", - "Problems:", String.valueOf(this.getIdealStatus() - this.getRepairStatus()) }; + GT_Utility.formatNumbers(this.mProgresstime / 20) + "secs /" + + GT_Utility.formatNumbers(this.mMaxProgresstime / 20) + + "secs", + "TRISO-Pebbles:", + GT_Utility.formatNumbers(this.fuelsupply) + "pcs. / " + GT_Utility.formatNumbers(this.fuelsupply) + "psc.", + "Helium-Level:", + GT_Utility.formatNumbers(this.HeliumSupply) + "L / " + + GT_Utility.formatNumbers(GT_TileEntity_THTR.HELIUM_NEEDED) + + "L", + "Coolant/t:", GT_Utility.formatNumbers(this.mProgresstime == 0 ? 0 : this.coolanttaking) + "L/t", + "Problems:", String.valueOf(this.getIdealStatus() - this.getRepairStatus()) }; } @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { - if (aActive) - return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_THTR.BASECASINGINDEX), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE) - .extFacing().build(), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW) - .extFacing().glow().build() }; + if (aActive) return new ITexture[] { + Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_THTR.BASECASINGINDEX), TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_THTR.BASECASINGINDEX), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER).extFacing() - .build(), - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_GLOW).extFacing() - .glow().build() }; + TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_FRONT_HEAT_EXCHANGER_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(GT_TileEntity_THTR.BASECASINGINDEX) }; } @@ -382,8 +383,8 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase } this.empty = !this.empty; GT_Utility.sendChatToPlayer( - aPlayer, - "THTR is now running in " + (this.empty ? "emptying mode." : "normal Operation")); + aPlayer, + "THTR is now running in " + (this.empty ? "emptying mode." : "normal Operation")); } @Override @@ -394,13 +395,13 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_EnhancedMultiBlockBase public static class THTRMaterials { public static final SimpleSubItemClass aTHTR_Materials = new SimpleSubItemClass( - "BISOPelletCompound", // 0 - "BISOPelletBall", // 1 - "TRISOPelletCompound", // 2 - "TRISOPelletBall", // 3 - "TRISOPellet", // 4 - "BurnedOutTRISOPelletBall", // 5 - "BurnedOutTRISOPellet" // 6 + "BISOPelletCompound", // 0 + "BISOPelletBall", // 1 + "TRISOPelletCompound", // 2 + "TRISOPelletBall", // 3 + "TRISOPellet", // 4 + "BurnedOutTRISOPelletBall", // 5 + "BurnedOutTRISOPellet" // 6 ); public static final int MATERIAL_FUEL_INDEX = 4; public static final int MATERIAL_USED_FUEL_INDEX = 5; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java index 93ccdecd6c..a1e1f1fd46 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java @@ -85,7 +85,7 @@ import gregtech.api.util.GT_Utility; import gregtech.common.items.GT_MetaGenerated_Tool_01; public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_TileEntity_Windmill> - implements ISurvivalConstructable, IGetTitleColor { + implements ISurvivalConstructable, IGetTitleColor { private static final IIcon[] iIcons = new IIcon[2]; private static final IIconContainer[] iIconContainers = new IIconContainer[2]; @@ -106,75 +106,72 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock private static final String STRUCTURE_PIECE_MAIN = "main"; private static final IStructureDefinition<GT_TileEntity_Windmill> STRUCTURE_DEFINITION = StructureDefinition - .<GT_TileEntity_Windmill>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { - { " ", " ", " ", " p ", " ", " ", " " }, - { " ", " ", " ppp ", " p p ", " ppp ", " ", " " }, - { " ", " ppppp ", " p p ", " p p ", " p p ", " ppppp ", " " }, - { " ppppp ", "p p", "p p", "p p", "p p", "p p", " ppppp " }, - { " ppspp ", "p p", "p p", "p p", "p p", "p p", " ppppp " }, - { " ppppp ", "p p", "p p", "p p", "p p", "p p", " ppppp " }, - { " ", " ppppp ", " p p ", " p p ", " p p ", " ppppp ", " " }, - { " ", " ccc ", " c c ", " c c ", " c c ", " ccc ", " " }, - { " ", " ccc ", " c c ", " c c ", " c c ", " ccc ", " " }, - { " ", " ccc ", " c c ", " c c ", " c c ", " ccc ", " " }, - { " ", " ccc ", " c c ", " c c ", " c c ", " ccc ", " " }, - { " bb~bb ", "bbbbbbb", "bbbbbbb", "bbbbbbb", "bbbbbbb", "bbbbbbb", " bbbbb " }, })) - .addElement('p', ofBlockAnyMeta(Blocks.planks)) - .addElement( - 'c', - ofChain( - onElementPass(t -> t.mHardenedClay++, ofBlock(Blocks.hardened_clay, 0)), - ofTileAdder(GT_TileEntity_Windmill::addDispenserToOutputSet, Blocks.hardened_clay, 0), - onElementPass(t -> t.mDoor++, new IStructureElementNoPlacement<GT_TileEntity_Windmill>() { - - private final IStructureElement<GT_TileEntity_Windmill> delegate = ofBlock( - Blocks.wooden_door, - 0); - - @Override - public boolean check(GT_TileEntity_Windmill gt_tileEntity_windmill, World world, int x, - int y, int z) { - return this.delegate.check(gt_tileEntity_windmill, world, x, y, z); - } - - @Override - public boolean spawnHint(GT_TileEntity_Windmill gt_tileEntity_windmill, World world, - int x, int y, int z, ItemStack trigger) { - return this.delegate.spawnHint(gt_tileEntity_windmill, world, x, y, z, trigger); - } - }))) - .addElement('b', ofBlock(Blocks.brick_block, 0)) - .addElement('s', new IStructureElement<GT_TileEntity_Windmill>() { + .<GT_TileEntity_Windmill>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { { " ", " ", " ", " p ", " ", " ", " " }, + { " ", " ", " ppp ", " p p ", " ppp ", " ", " " }, + { " ", " ppppp ", " p p ", " p p ", " p p ", " ppppp ", " " }, + { " ppppp ", "p p", "p p", "p p", "p p", "p p", " ppppp " }, + { " ppspp ", "p p", "p p", "p p", "p p", "p p", " ppppp " }, + { " ppppp ", "p p", "p p", "p p", "p p", "p p", " ppppp " }, + { " ", " ppppp ", " p p ", " p p ", " p p ", " ppppp ", " " }, + { " ", " ccc ", " c c ", " c c ", " c c ", " ccc ", " " }, + { " ", " ccc ", " c c ", " c c ", " c c ", " ccc ", " " }, + { " ", " ccc ", " c c ", " c c ", " c c ", " ccc ", " " }, + { " ", " ccc ", " c c ", " c c ", " c c ", " ccc ", " " }, + { " bb~bb ", "bbbbbbb", "bbbbbbb", "bbbbbbb", "bbbbbbb", "bbbbbbb", " bbbbb " }, })) + .addElement('p', ofBlockAnyMeta(Blocks.planks)) + .addElement( + 'c', + ofChain( + onElementPass(t -> t.mHardenedClay++, ofBlock(Blocks.hardened_clay, 0)), + ofTileAdder(GT_TileEntity_Windmill::addDispenserToOutputSet, Blocks.hardened_clay, 0), + onElementPass(t -> t.mDoor++, new IStructureElementNoPlacement<GT_TileEntity_Windmill>() { + + private final IStructureElement<GT_TileEntity_Windmill> delegate = ofBlock(Blocks.wooden_door, 0); - @Override - public boolean check(GT_TileEntity_Windmill t, World world, int x, int y, int z) { - TileEntity tileEntity = world.getTileEntity(x, y, z); - return t.setRotorBlock(tileEntity); - } - - @Override - public boolean spawnHint(GT_TileEntity_Windmill t, World world, int x, int y, int z, - ItemStack trigger) { - StructureLibAPI.hintParticle(world, x, y, z, StructureLibAPI.getBlockHint(), 0); - return true; - } + @Override + public boolean check(GT_TileEntity_Windmill gt_tileEntity_windmill, World world, int x, int y, + int z) { + return this.delegate.check(gt_tileEntity_windmill, world, x, y, z); + } - @Override - public boolean placeBlock(GT_TileEntity_Windmill gt_tileEntity_windmill, World world, int x, int y, + @Override + public boolean spawnHint(GT_TileEntity_Windmill gt_tileEntity_windmill, World world, int x, int y, int z, ItemStack trigger) { - return false; - } + return this.delegate.spawnHint(gt_tileEntity_windmill, world, x, y, z, trigger); + } + }))) + .addElement('b', ofBlock(Blocks.brick_block, 0)) + .addElement('s', new IStructureElement<GT_TileEntity_Windmill>() { - @Override - public BlocksToPlace getBlocksToPlace(GT_TileEntity_Windmill gt_tileEntity_windmill, World world, int x, - int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { - return BlocksToPlace.create(new ItemStack(ItemRegistry.ROTORBLOCK)); - } - }).build(); + @Override + public boolean check(GT_TileEntity_Windmill t, World world, int x, int y, int z) { + TileEntity tileEntity = world.getTileEntity(x, y, z); + return t.setRotorBlock(tileEntity); + } + + @Override + public boolean spawnHint(GT_TileEntity_Windmill t, World world, int x, int y, int z, ItemStack trigger) { + StructureLibAPI.hintParticle(world, x, y, z, StructureLibAPI.getBlockHint(), 0); + return true; + } + + @Override + public boolean placeBlock(GT_TileEntity_Windmill gt_tileEntity_windmill, World world, int x, int y, int z, + ItemStack trigger) { + return false; + } + + @Override + public BlocksToPlace getBlocksToPlace(GT_TileEntity_Windmill gt_tileEntity_windmill, World world, int x, + int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { + return BlocksToPlace.create(new ItemStack(ItemRegistry.ROTORBLOCK)); + } + }) + .build(); @Override public IStructureDefinition<GT_TileEntity_Windmill> getStructureDefinition() { @@ -189,17 +186,22 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Windmill").addInfo("Controller block for the Windmill") - .addInfo("A primitive Grinder powered by Kinetic energy") - .addInfo("Speed and output will be affected by wind speed, recipe and rotor") - .addInfo("Please use the Primitive Rotor").addInfo("Macerates 16 items at a time") - .addInfo("The structure is too complex!") - .addInfo("Follow the StructureLib hologram projector to build the main structure.").addSeparator() - .beginStructureBlock(7, 12, 7, false).addController("Front bottom center") - .addCasingInfoMin("Hardened Clay block", 40, false) - .addOtherStructurePart("Dispenser", "Any Hardened Clay block") - .addOtherStructurePart("0-1 Wooden door", "Any Hardened Clay block") - .addStructureHint("Primitive Kinetic Shaftbox", 1).toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + tt.addMachineType("Windmill") + .addInfo("Controller block for the Windmill") + .addInfo("A primitive Grinder powered by Kinetic energy") + .addInfo("Speed and output will be affected by wind speed, recipe and rotor") + .addInfo("Please use the Primitive Rotor") + .addInfo("Macerates 16 items at a time") + .addInfo("The structure is too complex!") + .addInfo("Follow the StructureLib hologram projector to build the main structure.") + .addSeparator() + .beginStructureBlock(7, 12, 7, false) + .addController("Front bottom center") + .addCasingInfoMin("Hardened Clay block", 40, false) + .addOtherStructurePart("Dispenser", "Any Hardened Clay block") + .addOtherStructurePart("0-1 Wooden door", "Any Hardened Clay block") + .addStructureHint("Primitive Kinetic Shaftbox", 1) + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); return tt; } @@ -219,7 +221,7 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock @Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { + ItemStack aStack) { return true; } @@ -239,40 +241,40 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock return new float[] { 0.8f, 1f }; } if (block == Blocks.gravel || block == Blocks.cobblestone - || block == Blocks.stone - || block == Blocks.sandstone - || block == Blocks.clay - || block == Blocks.hardened_clay - || block == Blocks.stained_hardened_clay - || block == Blocks.wool - || block == Blocks.netherrack - || block == Blocks.log - || block == Blocks.log2) { + || block == Blocks.stone + || block == Blocks.sandstone + || block == Blocks.clay + || block == Blocks.hardened_clay + || block == Blocks.stained_hardened_clay + || block == Blocks.wool + || block == Blocks.netherrack + || block == Blocks.log + || block == Blocks.log2) { return new float[] { 1f, 1.5f }; } final ItemData association = GT_OreDictUnificator.getAssociation(itemStack); final OrePrefixes prefix = association == null ? null : association.mPrefix; if (prefix == null || association.mMaterial == null - || association.mMaterial.mMaterial == null - || association.mMaterial.mMaterial.getDust(1) == null) { + || association.mMaterial.mMaterial == null + || association.mMaterial.mMaterial.getDust(1) == null) { return new float[] { 1f, 1f }; } if (OrePrefixes.ore == prefix || OrePrefixes.oreNetherrack == prefix - || OrePrefixes.oreEndstone == prefix - || OrePrefixes.oreBlackgranite == prefix - || OrePrefixes.oreRedgranite == prefix - || OrePrefixes.oreMarble == prefix - || OrePrefixes.oreBasalt == prefix) { + || OrePrefixes.oreEndstone == prefix + || OrePrefixes.oreBlackgranite == prefix + || OrePrefixes.oreRedgranite == prefix + || OrePrefixes.oreMarble == prefix + || OrePrefixes.oreBasalt == prefix) { return new float[] { 0.5f, 1f }; } if (OrePrefixes.stone == prefix || OrePrefixes.stoneBricks == prefix - || OrePrefixes.stoneChiseled == prefix - || OrePrefixes.stoneCobble == prefix - || OrePrefixes.stoneCracked == prefix - || OrePrefixes.stoneMossy == prefix - || OrePrefixes.stoneMossyBricks == prefix - || OrePrefixes.stoneSmooth == prefix - || OrePrefixes.cobblestone == prefix) { + || OrePrefixes.stoneChiseled == prefix + || OrePrefixes.stoneCobble == prefix + || OrePrefixes.stoneCracked == prefix + || OrePrefixes.stoneMossy == prefix + || OrePrefixes.stoneMossyBricks == prefix + || OrePrefixes.stoneSmooth == prefix + || OrePrefixes.cobblestone == prefix) { return new float[] { 1f, 1.5f }; } return new float[] { 1f, 1f }; @@ -285,7 +287,7 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock if (this.mOutputItems == null) this.mOutputItems = new ItemStack[2]; GT_Recipe tRecipe = RecipeMaps.maceratorRecipes - .findRecipe(this.getBaseMetaTileEntity(), false, false, V[1], null, itemStack); + .findRecipe(this.getBaseMetaTileEntity(), false, false, V[1], null, itemStack); if (tRecipe == null) { return false; } @@ -302,12 +304,12 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock this.mOutputItems[0] = tRecipe.getOutput(0); float[] mRecipe = this.multiplierRecipe(itemStack); float multiper = Math.min( - mRecipe[1], - Math.max( - mRecipe[0], - 2f * (float) Math.sqrt((float) 1 / (this.rotorBlock.getWindStrength() + 1)) - * this.OutputMultiplier(this.rotorBlock) - * (mRecipe[0] + mRecipe[1]))); + mRecipe[1], + Math.max( + mRecipe[0], + 2f * (float) Math.sqrt((float) 1 / (this.rotorBlock.getWindStrength() + 1)) + * this.OutputMultiplier(this.rotorBlock) + * (mRecipe[0] + mRecipe[1]))); int amount = (int) Math.floor(multiper * (this.mOutputItems[0].stackSize * this.mMulti)); // Split ItemStack --by gtpp @@ -330,7 +332,8 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock @Override public void stopMachine() { - this.getBaseMetaTileEntity().disableWorking(); + this.getBaseMetaTileEntity() + .disableWorking(); } public boolean addDispenserToOutputSet(TileEntity aTileEntity) { @@ -356,9 +359,10 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock for (TileEntityDispenser tHatch : this.tileEntityDispensers) { for (int i = tHatch.getSizeInventory() - 1; i >= 0; i--) { if (tHatch.getStackInSlot(i) == null || GT_Utility.areStacksEqual(tHatch.getStackInSlot(i), aStack) - && aStack.stackSize + tHatch.getStackInSlot(i).stackSize <= 64) { + && aStack.stackSize + tHatch.getStackInSlot(i).stackSize <= 64) { if (GT_Utility.areStacksEqual(tHatch.getStackInSlot(i), aStack)) { - ItemStack merge = tHatch.getStackInSlot(i).copy(); + ItemStack merge = tHatch.getStackInSlot(i) + .copy(); merge.stackSize = aStack.stackSize + tHatch.getStackInSlot(i).stackSize; tHatch.setInventorySlotContents(i, merge); } else { @@ -386,9 +390,8 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock this.mHardenedClay = 0; if (!this.checkPiece(STRUCTURE_PIECE_MAIN, 3, 11, 0) || this.tileEntityDispensers.isEmpty() - || this.mDoor > 2 - || this.mHardenedClay < 40) - return false; + || this.mDoor > 2 + || this.mHardenedClay < 40) return false; this.mWrench = true; this.mScrewdriver = true; @@ -440,8 +443,8 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock @Override public String[] getInfoData() { return new String[] { "Progress:", - this.mProgresstime + " Grindings of " + this.mMaxProgresstime + " needed Grindings", "GrindPower:", - this.rotorBlock.getGrindPower() + "KU/t" }; + this.mProgresstime + " Grindings of " + this.mMaxProgresstime + " needed Grindings", "GrindPower:", + this.rotorBlock.getGrindPower() + "KU/t" }; } @SideOnly(Side.CLIENT) @@ -488,7 +491,7 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { ITexture[] ret = new ITexture[6]; @@ -509,10 +512,16 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock } public boolean isClientSide() { - if (this.getBaseMetaTileEntity().getWorld() != null) return this.getBaseMetaTileEntity().getWorld().isRemote - ? FMLCommonHandler.instance().getSide() == Side.CLIENT - : FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT; - return FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT; + if (this.getBaseMetaTileEntity() + .getWorld() != null) + return this.getBaseMetaTileEntity() + .getWorld().isRemote + ? FMLCommonHandler.instance() + .getSide() == Side.CLIENT + : FMLCommonHandler.instance() + .getEffectiveSide() == Side.CLIENT; + return FMLCommonHandler.instance() + .getEffectiveSide() == Side.CLIENT; } @Override @@ -528,7 +537,8 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock public float OutputMultiplier(BW_RotorBlock rotorBlock) { try { - return ((BW_Stonage_Rotors) rotorBlock.rotorSlot.get().getItem()).getmRotor(); + return ((BW_Stonage_Rotors) rotorBlock.rotorSlot.get() + .getItem()).getmRotor(); } catch (Exception e) { return 1f; } @@ -536,7 +546,8 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock public int getSpeed(BW_RotorBlock rotorBlock) { try { - return ((BW_Stonage_Rotors) rotorBlock.rotorSlot.get().getItem()).getSpeed(); + return ((BW_Stonage_Rotors) rotorBlock.rotorSlot.get() + .getItem()).getSpeed(); } catch (Exception e) { return 1; } @@ -544,8 +555,8 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock public void setRotorDamage(BW_RotorBlock rotorBlock, int damage) { try { - ((BW_Stonage_Rotors) rotorBlock.rotorSlot.get().getItem()) - .damageItemStack(rotorBlock.rotorSlot.get(), damage); + ((BW_Stonage_Rotors) rotorBlock.rotorSlot.get() + .getItem()).damageItemStack(rotorBlock.rotorSlot.get(), damage); } catch (Exception e) { rotorBlock.rotorSlot.damage(damage, false); } @@ -554,16 +565,19 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock @Override public GUITextureSet getGUITextureSet() { return new GUITextureSet().setMainBackground(BW_UITextures.BACKGROUND_BROWN) - .setItemSlot(BW_UITextures.SLOT_BROWN).setTitleTab( - BW_UITextures.TAB_TITLE_BROWN, - BW_UITextures.TAB_TITLE_DARK_BROWN, - BW_UITextures.TAB_TITLE_ANGULAR_BROWN); + .setItemSlot(BW_UITextures.SLOT_BROWN) + .setTitleTab( + BW_UITextures.TAB_TITLE_BROWN, + BW_UITextures.TAB_TITLE_DARK_BROWN, + BW_UITextures.TAB_TITLE_ANGULAR_BROWN); } @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(BW_UITextures.PICTURE_BW_LOGO_47X21).setSize(47, 21).setPos(123, 59)); + new DrawableWidget().setDrawable(BW_UITextures.PICTURE_BW_LOGO_47X21) + .setSize(47, 21) + .setPos(123, 59)); } @Override @@ -574,51 +588,54 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new SlotWidget(this.inventoryHandler, 1).setBackground(this.getGUITextureSet().getItemSlot()) - .setPos(59, 35)) - .widget(new DrawableWidget() { + new SlotWidget(this.inventoryHandler, 1).setBackground( + this.getGUITextureSet() + .getItemSlot()) + .setPos(59, 35)) + .widget(new DrawableWidget() { - private static final int DIVIDER = 125; + private static final int DIVIDER = 125; - @Override - public void onScreenUpdate() { - super.onScreenUpdate(); - if (GT_TileEntity_Windmill.this.mMaxProgresstime > 0) { - if (System.currentTimeMillis() / DIVIDER % 40 == 30) - this.setDrawable(BW_UITextures.PICTURE_WINDMILL_ROTATING[3]); - else if (System.currentTimeMillis() / DIVIDER % 40 == 20) - this.setDrawable(BW_UITextures.PICTURE_WINDMILL_ROTATING[2]); - else if (System.currentTimeMillis() / DIVIDER % 40 == 10) - this.setDrawable(BW_UITextures.PICTURE_WINDMILL_ROTATING[1]); - else if (System.currentTimeMillis() / DIVIDER % 40 == 0) - this.setDrawable(BW_UITextures.PICTURE_WINDMILL_ROTATING[0]); - } else { - this.setDrawable(BW_UITextures.PICTURE_WINDMILL_EMPTY); - } + @Override + public void onScreenUpdate() { + super.onScreenUpdate(); + if (GT_TileEntity_Windmill.this.mMaxProgresstime > 0) { + if (System.currentTimeMillis() / DIVIDER % 40 == 30) + this.setDrawable(BW_UITextures.PICTURE_WINDMILL_ROTATING[3]); + else if (System.currentTimeMillis() / DIVIDER % 40 == 20) + this.setDrawable(BW_UITextures.PICTURE_WINDMILL_ROTATING[2]); + else if (System.currentTimeMillis() / DIVIDER % 40 == 10) + this.setDrawable(BW_UITextures.PICTURE_WINDMILL_ROTATING[1]); + else if (System.currentTimeMillis() / DIVIDER % 40 == 0) + this.setDrawable(BW_UITextures.PICTURE_WINDMILL_ROTATING[0]); + } else { + this.setDrawable(BW_UITextures.PICTURE_WINDMILL_EMPTY); } - }.setDrawable(BW_UITextures.PICTURE_WINDMILL_EMPTY).setPos(85, 27).setSize(32, 32)) - .widget( - new FakeSyncWidget.IntegerSyncer( - () -> this.mMaxProgresstime, - val -> this.mMaxProgresstime = val)) - .widget( - new ItemDrawable( - () -> this.mMachine && !this.getBaseMetaTileEntity().isActive() - ? GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOFTMALLET, - 1, - null, - null, - null) - : null).asWidget().setPos(66, 66)) - .widget( - new FakeSyncWidget.BooleanSyncer( - () -> this.getBaseMetaTileEntity().isActive(), - val -> this.getBaseMetaTileEntity().setActive(val))) - .widget( - new TextWidget(GT_Utility.trans("138", "Incomplete Structure.")) - .setDefaultColor(this.COLOR_TEXT_WHITE.get()).setMaxWidth(150) - .setEnabled(widget -> !this.mMachine).setPos(92, 22)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> this.mMachine, val -> this.mMachine = val)); + } + }.setDrawable(BW_UITextures.PICTURE_WINDMILL_EMPTY) + .setPos(85, 27) + .setSize(32, 32)) + .widget(new FakeSyncWidget.IntegerSyncer(() -> this.mMaxProgresstime, val -> this.mMaxProgresstime = val)) + .widget( + new ItemDrawable( + () -> this.mMachine && !this.getBaseMetaTileEntity() + .isActive() + ? GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.SOFTMALLET, 1, null, null, null) + : null).asWidget() + .setPos(66, 66)) + .widget( + new FakeSyncWidget.BooleanSyncer( + () -> this.getBaseMetaTileEntity() + .isActive(), + val -> this.getBaseMetaTileEntity() + .setActive(val))) + .widget( + new TextWidget(GT_Utility.trans("138", "Incomplete Structure.")) + .setDefaultColor(this.COLOR_TEXT_WHITE.get()) + .setMaxWidth(150) + .setEnabled(widget -> !this.mMachine) + .setPos(92, 22)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> this.mMachine, val -> this.mMachine = val)); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java index fc490d6109..c8ea85d182 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java @@ -70,43 +70,42 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlockBase<GT_TileEntity_MegaBlastFurnace> - implements ISurvivalConstructable { + implements ISurvivalConstructable { private static final int CASING_INDEX = 11; private static final IStructureDefinition<GT_TileEntity_MegaBlastFurnace> STRUCTURE_DEFINITION = StructureDefinition - .<GT_TileEntity_MegaBlastFurnace>builder().addShape("main", createShape()) - .addElement('=', StructureElementAirNoHint.getInstance()) - .addElement( - 't', - buildHatchAdder(GT_TileEntity_MegaBlastFurnace.class) - .atLeast( - OutputHatch.withAdder(GT_TileEntity_MegaBlastFurnace::addOutputHatchToTopList) - .withCount(t -> t.mPollutionOutputHatches.size())) - .casingIndex(CASING_INDEX).dot(1).buildAndChain(GregTech_API.sBlockCasings1, CASING_INDEX)) - .addElement('m', Muffler.newAny(CASING_INDEX, 2)) - .addElement( - 'C', - withChannel( - "coil", - ofCoil( - GT_TileEntity_MegaBlastFurnace::setCoilLevel, - GT_TileEntity_MegaBlastFurnace::getCoilLevel))) - .addElement( - 'g', - withChannel( - "glass", - BorosilicateGlass.ofBoroGlass( - (byte) 0, - (byte) 1, - Byte.MAX_VALUE, - (te, t) -> te.glassTier = t, - te -> te.glassTier))) - .addElement( - 'b', - buildHatchAdder(GT_TileEntity_MegaBlastFurnace.class) - .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy.or(ExoticEnergy)) - .casingIndex(CASING_INDEX).dot(1).buildAndChain(GregTech_API.sBlockCasings1, CASING_INDEX)) - .build(); + .<GT_TileEntity_MegaBlastFurnace>builder() + .addShape("main", createShape()) + .addElement('=', StructureElementAirNoHint.getInstance()) + .addElement( + 't', + buildHatchAdder(GT_TileEntity_MegaBlastFurnace.class) + .atLeast( + OutputHatch.withAdder(GT_TileEntity_MegaBlastFurnace::addOutputHatchToTopList) + .withCount(t -> t.mPollutionOutputHatches.size())) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain(GregTech_API.sBlockCasings1, CASING_INDEX)) + .addElement('m', Muffler.newAny(CASING_INDEX, 2)) + .addElement( + 'C', + withChannel( + "coil", + ofCoil(GT_TileEntity_MegaBlastFurnace::setCoilLevel, GT_TileEntity_MegaBlastFurnace::getCoilLevel))) + .addElement( + 'g', + withChannel( + "glass", + BorosilicateGlass + .ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glassTier = t, te -> te.glassTier))) + .addElement( + 'b', + buildHatchAdder(GT_TileEntity_MegaBlastFurnace.class) + .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy.or(ExoticEnergy)) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain(GregTech_API.sBlockCasings1, CASING_INDEX)) + .build(); private static String[][] createShape() { String[][] raw = new String[20][]; @@ -149,7 +148,7 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock private HeatingCoilLevel mCoilLevel; protected final ArrayList<GT_MetaTileEntity_Hatch_Output> mPollutionOutputHatches = new ArrayList<>(); protected final FluidStack[] pollutionFluidStacks = { Materials.CarbonDioxide.getGas(1000), - Materials.CarbonMonoxide.getGas(1000), Materials.SulfurDioxide.getGas(1000) }; + Materials.CarbonMonoxide.getGas(1000), Materials.SulfurDioxide.getGas(1000) }; private int mHeatingCapacity; private byte glassTier; private final static int polPtick = ConfigHandler.basePollutionMBFSecond / 20 * ConfigHandler.megaMachinesMax; @@ -170,27 +169,32 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Blast Furnace").addInfo("Controller block for the Mega Blast Furnace") - .addInfo("You can use some fluids to reduce recipe time. Place the circuit in the Input Bus") - .addInfo("Each 900K over the min. Heat required reduces power consumption by 5% (multiplicatively)") - .addInfo("Each 1800K over the min. Heat allows for an overclock to be upgraded to a perfect overclock.") - .addInfo( - "That means the EBF will reduce recipe time by a factor 4 instead of 2 (giving 100% efficiency).") - .addInfo("Additionally gives +100K for every tier past MV") - .addPollutionAmount(20 * this.getPollutionPerTick(null)).addSeparator() - .beginStructureBlock(15, 20, 15, true).addController("3rd layer center") - .addCasingInfoRange("Heat Proof Machine Casing", 0, 279, false) - .addOtherStructurePart("864x Heating Coils", "Inner 13x18x13 (Hollow)") - .addOtherStructurePart("1007x Borosilicate Glass", "Outer 15x18x15") - .addStructureInfo("The glass tier limits the Energy Input tier") - .addEnergyHatch("Any bottom layer casing").addMaintenanceHatch("Any bottom layer casing") - .addMufflerHatch("Top middle").addInputBus("Any bottom layer casing") - .addInputHatch("Any bottom layer casing").addOutputBus("Any bottom layer casing") - .addOutputHatch("Gasses, Any top layer casing") - .addStructureInfo("Recovery amount scales with Muffler Hatch tier") - .addOutputHatch("Platline fluids, Any bottom layer casing") - .addStructureHint("This Mega Multiblock is too big to have its structure hologram displayed fully.") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); + tt.addMachineType("Blast Furnace") + .addInfo("Controller block for the Mega Blast Furnace") + .addInfo("You can use some fluids to reduce recipe time. Place the circuit in the Input Bus") + .addInfo("Each 900K over the min. Heat required reduces power consumption by 5% (multiplicatively)") + .addInfo("Each 1800K over the min. Heat allows for an overclock to be upgraded to a perfect overclock.") + .addInfo("That means the EBF will reduce recipe time by a factor 4 instead of 2 (giving 100% efficiency).") + .addInfo("Additionally gives +100K for every tier past MV") + .addPollutionAmount(20 * this.getPollutionPerTick(null)) + .addSeparator() + .beginStructureBlock(15, 20, 15, true) + .addController("3rd layer center") + .addCasingInfoRange("Heat Proof Machine Casing", 0, 279, false) + .addOtherStructurePart("864x Heating Coils", "Inner 13x18x13 (Hollow)") + .addOtherStructurePart("1007x Borosilicate Glass", "Outer 15x18x15") + .addStructureInfo("The glass tier limits the Energy Input tier") + .addEnergyHatch("Any bottom layer casing") + .addMaintenanceHatch("Any bottom layer casing") + .addMufflerHatch("Top middle") + .addInputBus("Any bottom layer casing") + .addInputHatch("Any bottom layer casing") + .addOutputBus("Any bottom layer casing") + .addOutputHatch("Gasses, Any top layer casing") + .addStructureInfo("Recovery amount scales with Muffler Hatch tier") + .addOutputHatch("Platline fluids, Any bottom layer casing") + .addStructureHint("This Mega Multiblock is too big to have its structure hologram displayed fully.") + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); return tt; } @@ -208,12 +212,12 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock @Override public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, - float aX, float aY, float aZ) { + float aX, float aY, float aZ) { if (!aPlayer.isSneaking()) { this.inputSeparation = !this.inputSeparation; GT_Utility.sendChatToPlayer( - aPlayer, - StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + this.inputSeparation); + aPlayer, + StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + this.inputSeparation); return true; } this.batchMode = !this.batchMode; @@ -227,16 +231,26 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { - if (aActive) return new ITexture[] { casingTexturePages[0][CASING_INDEX], - TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW).extFacing() - .glow().build() }; - return new ITexture[] { casingTexturePages[0][CASING_INDEX], - TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW).extFacing().glow() - .build() }; + if (aActive) return new ITexture[] { casingTexturePages[0][CASING_INDEX], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { casingTexturePages[0][CASING_INDEX], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { casingTexturePages[0][CASING_INDEX] }; } @@ -266,10 +280,10 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock @Override protected String[] getExtendedInfoData() { return new String[] { StatCollector.translateToLocal("GT5U.EBF.heat") + ": " - + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(this.mHeatingCapacity) - + EnumChatFormatting.RESET - + " K" }; + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(this.mHeatingCapacity) + + EnumChatFormatting.RESET + + " K" }; } @Override @@ -280,15 +294,16 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock @Override protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) { return super.createOverclockCalculator(recipe).setRecipeHeat(recipe.mSpecialValue) - .setMachineHeat(GT_TileEntity_MegaBlastFurnace.this.mHeatingCapacity).setHeatOC(true) - .setHeatDiscount(true); + .setMachineHeat(GT_TileEntity_MegaBlastFurnace.this.mHeatingCapacity) + .setHeatOC(true) + .setHeatDiscount(true); } @Override protected @Nonnull CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { return recipe.mSpecialValue <= GT_TileEntity_MegaBlastFurnace.this.mHeatingCapacity - ? CheckRecipeResultRegistry.SUCCESSFUL - : CheckRecipeResultRegistry.insufficientHeat(recipe.mSpecialValue); + ? CheckRecipeResultRegistry.SUCCESSFUL + : CheckRecipeResultRegistry.insufficientHeat(recipe.mSpecialValue); } }.setMaxParallel(ConfigHandler.megaMachinesMax); } @@ -361,8 +376,7 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock this.mPollutionOutputHatches.clear(); if (!this.checkPiece("main", 7, 17, 0) || this.getCoilLevel() == HeatingCoilLevel.None - || this.mMaintenanceHatches.size() != 1) - return false; + || this.mMaintenanceHatches.size() != 1) return false; if (this.glassTier < 8) { for (int i = 0; i < this.mExoticEnergyHatches.size(); ++i) { @@ -381,7 +395,8 @@ public class GT_TileEntity_MegaBlastFurnace extends GT_TileEntity_MegaMultiBlock } } - this.mHeatingCapacity = (int) this.getCoilLevel().getHeat() + 100 * (BW_Util.getTier(this.getMaxInputEu()) - 2); + this.mHeatingCapacity = (int) this.getCoilLevel() + .getHeat() + 100 * (BW_Util.getTier(this.getMaxInputEu()) - 2); return true; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java index f7aaffef09..4b11f8d500 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaChemicalReactor.java @@ -52,7 +52,7 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; public class GT_TileEntity_MegaChemicalReactor - extends GT_TileEntity_MegaMultiBlockBase<GT_TileEntity_MegaChemicalReactor> implements ISurvivalConstructable { + extends GT_TileEntity_MegaMultiBlockBase<GT_TileEntity_MegaChemicalReactor> implements ISurvivalConstructable { private byte glassTier; @@ -67,18 +67,27 @@ public class GT_TileEntity_MegaChemicalReactor @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Chemical Reactor").addInfo("Controller block for the Chemical Reactor") - .addInfo("What molecule do you want to synthesize") - .addInfo("Or you want to replace something in this molecule").addInfo("The structure is too complex!") - .addInfo("Follow the Structure Lib hologram projector to build the main structure.").addSeparator() - .beginStructureBlock(5, 5, 9, false).addController("Front center") - .addStructureInfo("46x Chemically Inert Machine Casing (minimum)") - .addStructureInfo("7x Fusion Coil Block").addStructureInfo("28x PTFE Pipe Casing") - .addStructureInfo("64x Borosilicate Glass Block (any tier)") - .addStructureInfo("The glass tier limits the Energy Input tier").addEnergyHatch("Hint block ", 3) - .addMaintenanceHatch("Hint block ", 2).addInputHatch("Hint block ", 1).addInputBus("Hint block ", 1) - .addOutputBus("Hint block ", 1).addOutputHatch("Hint block ", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + tt.addMachineType("Chemical Reactor") + .addInfo("Controller block for the Chemical Reactor") + .addInfo("What molecule do you want to synthesize") + .addInfo("Or you want to replace something in this molecule") + .addInfo("The structure is too complex!") + .addInfo("Follow the Structure Lib hologram projector to build the main structure.") + .addSeparator() + .beginStructureBlock(5, 5, 9, false) + .addController("Front center") + .addStructureInfo("46x Chemically Inert Machine Casing (minimum)") + .addStructureInfo("7x Fusion Coil Block") + .addStructureInfo("28x PTFE Pipe Casing") + .addStructureInfo("64x Borosilicate Glass Block (any tier)") + .addStructureInfo("The glass tier limits the Energy Input tier") + .addEnergyHatch("Hint block ", 3) + .addMaintenanceHatch("Hint block ", 2) + .addInputHatch("Hint block ", 1) + .addInputBus("Hint block ", 1) + .addOutputBus("Hint block ", 1) + .addOutputHatch("Hint block ", 1) + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); return tt; } @@ -89,16 +98,26 @@ public class GT_TileEntity_MegaChemicalReactor @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { - if (aActive) return new ITexture[] { casingTexturePages[1][48], - TextureFactory.builder().addIcon(OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE_GLOW).extFacing() - .glow().build() }; - return new ITexture[] { casingTexturePages[1][48], - TextureFactory.builder().addIcon(OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_GLOW).extFacing().glow() - .build() }; + if (aActive) return new ITexture[] { casingTexturePages[1][48], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { casingTexturePages[1][48], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { casingTexturePages[1][48] }; } @@ -125,13 +144,13 @@ public class GT_TileEntity_MegaChemicalReactor public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { inputSeparation = !inputSeparation; GT_Utility.sendChatToPlayer( - aPlayer, - StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); + aPlayer, + StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); } @Override public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, - float aX, float aY, float aZ) { + float aX, float aY, float aZ) { if (aPlayer.isSneaking()) { this.batchMode = !this.batchMode; if (this.batchMode) { @@ -146,7 +165,8 @@ public class GT_TileEntity_MegaChemicalReactor @Override protected ProcessingLogic createProcessingLogic() { - return new ProcessingLogic().enablePerfectOverclock().setMaxParallel(ConfigHandler.megaMachinesMax); + return new ProcessingLogic().enablePerfectOverclock() + .setMaxParallel(ConfigHandler.megaMachinesMax); } @Override @@ -159,7 +179,7 @@ public class GT_TileEntity_MegaChemicalReactor if (this.mMachine) return -1; int realBudget = elementBudget >= 200 ? elementBudget : Math.min(200, elementBudget * 5); return this - .survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 2, 2, 0, realBudget, source, actor, false, true); + .survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 2, 2, 0, realBudget, source, actor, false, true); } // -------------- TEC TECH COMPAT ---------------- @@ -192,40 +212,38 @@ public class GT_TileEntity_MegaChemicalReactor private static final int CASING_INDEX = 176; private static final String STRUCTURE_PIECE_MAIN = "main"; private static final IStructureDefinition<GT_TileEntity_MegaChemicalReactor> STRUCTURE_DEFINITION = StructureDefinition - .<GT_TileEntity_MegaChemicalReactor>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { - { "ttttt", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", "ttttt" }, - { "tgggt", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", "teeet" }, - { "tg~gt", " gcg ", " gcg ", " gcg ", " gcg ", " gcg ", " gcg ", " gcg ", "teret" }, - { "tgggt", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", "teeet" }, - { "ttttt", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", - "ttttt" }, })) - .addElement('p', ofBlock(GregTech_API.sBlockCasings8, 1)) - .addElement('t', ofBlock(GregTech_API.sBlockCasings8, 0)) - .addElement( - 'd', - buildHatchAdder(GT_TileEntity_MegaChemicalReactor.class) - .atLeast(InputBus, InputHatch, OutputBus, OutputHatch).casingIndex(CASING_INDEX).dot(1) - .buildAndChain(GregTech_API.sBlockCasings8, 0)) - .addElement('r', Maintenance.newAny(CASING_INDEX, 2)) - .addElement( - 'e', - buildHatchAdder(GT_TileEntity_MegaChemicalReactor.class) - .atLeast(Energy.or(ExoticEnergy), InputHatch, InputBus, OutputHatch, OutputBus) - .casingIndex(CASING_INDEX).dot(3).buildAndChain(GregTech_API.sBlockCasings8, 0)) - .addElement('c', ofChain(ofBlock(GregTech_API.sBlockCasings4, 7), ofBlock(GregTech_API.sBlockCasings5, 13))) - .addElement( - 'g', - BorosilicateGlass.ofBoroGlass( - (byte) 0, - (byte) 1, - Byte.MAX_VALUE, - (te, t) -> te.glassTier = t, - te -> te.glassTier)) - .build(); + .<GT_TileEntity_MegaChemicalReactor>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { { "ttttt", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", "ttttt" }, + { "tgggt", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", "teeet" }, + { "tg~gt", " gcg ", " gcg ", " gcg ", " gcg ", " gcg ", " gcg ", " gcg ", "teret" }, + { "tgggt", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", " ggg ", "teeet" }, + { "ttttt", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", "dptpd", "ttttt" }, })) + .addElement('p', ofBlock(GregTech_API.sBlockCasings8, 1)) + .addElement('t', ofBlock(GregTech_API.sBlockCasings8, 0)) + .addElement( + 'd', + buildHatchAdder(GT_TileEntity_MegaChemicalReactor.class) + .atLeast(InputBus, InputHatch, OutputBus, OutputHatch) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain(GregTech_API.sBlockCasings8, 0)) + .addElement('r', Maintenance.newAny(CASING_INDEX, 2)) + .addElement( + 'e', + buildHatchAdder(GT_TileEntity_MegaChemicalReactor.class) + .atLeast(Energy.or(ExoticEnergy), InputHatch, InputBus, OutputHatch, OutputBus) + .casingIndex(CASING_INDEX) + .dot(3) + .buildAndChain(GregTech_API.sBlockCasings8, 0)) + .addElement('c', ofChain(ofBlock(GregTech_API.sBlockCasings4, 7), ofBlock(GregTech_API.sBlockCasings5, 13))) + .addElement( + 'g', + BorosilicateGlass + .ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glassTier = t, te -> te.glassTier)) + .build(); @Override public IStructureDefinition<GT_TileEntity_MegaChemicalReactor> getStructureDefinition() { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java index 478b27cbf1..80bc644e9e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaDistillTower.java @@ -60,7 +60,7 @@ import gregtech.api.util.GT_Utility; import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlockBase<GT_TileEntity_MegaDistillTower> - implements ISurvivalConstructable { + implements ISurvivalConstructable { protected static final int CASING_INDEX = 49; protected static final String STRUCTURE_PIECE_BASE = "base"; @@ -70,119 +70,113 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock static { IHatchElement<GT_TileEntity_MegaDistillTower> layeredOutputHatch = OutputHatch - .withCount(GT_TileEntity_MegaDistillTower::getCurrentLayerOutputHatchCount) - .withAdder(GT_TileEntity_MegaDistillTower::addLayerOutputHatch); - STRUCTURE_DEFINITION = StructureDefinition.<GT_TileEntity_MegaDistillTower>builder().addShape( + .withCount(GT_TileEntity_MegaDistillTower::getCurrentLayerOutputHatchCount) + .withAdder(GT_TileEntity_MegaDistillTower::addLayerOutputHatch); + STRUCTURE_DEFINITION = StructureDefinition.<GT_TileEntity_MegaDistillTower>builder() + .addShape( STRUCTURE_PIECE_BASE, transpose( - new String[][] { { "bbbbbbb~bbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", - "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", - "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", - "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb" }, })) - .addShape( - STRUCTURE_PIECE_LAYER, - transpose( - new String[][] { { "lllllllllllllll", "lcccccccccccccl", "lcccccccccccccl", - "lcccccccccccccl", "lcccccccccccccl", "lcccccccccccccl", "lcccccccccccccl", - "lcccccccccccccl", "lcccccccccccccl", "lcccccccccccccl", "lcccccccccccccl", - "lcccccccccccccl", "lcccccccccccccl", "lcccccccccccccl", "lllllllllllllll" }, - { "lllllllllllllll", "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "lllllllllllllll" }, - { "lllllllllllllll", "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "lllllllllllllll" }, - { "lllllllllllllll", "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "lllllllllllllll" }, - { "lllllllllllllll", "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "lllllllllllllll" }, })) - .addShape( - STRUCTURE_PIECE_TOP_HINT, - transpose( - new String[][] { { "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", - "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", - "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", - "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", "lllllllllllllll" }, - { "lllllllllllllll", "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "lllllllllllllll" }, - { "lllllllllllllll", "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "lllllllllllllll" }, - { "lllllllllllllll", "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "lllllllllllllll" }, - { "lllllllllllllll", "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "l=============l", "l=============l", - "l=============l", "lllllllllllllll" }, })) - .addElement('=', StructureElementAirNoHint.getInstance()) - .addElement( - 'b', - buildHatchAdder(GT_TileEntity_MegaDistillTower.class).atLeast( - InputHatch, - OutputHatch, - InputBus, - OutputBus, - Maintenance, - Energy.or(ExoticEnergy)).casingIndex(CASING_INDEX).dot(1).buildAndChain( - onElementPass( - GT_TileEntity_MegaDistillTower::onCasingFound, - ofBlock(GregTech_API.sBlockCasings4, 1)))) - .addElement( - 'l', - buildHatchAdder(GT_TileEntity_MegaDistillTower.class) - .atLeast(layeredOutputHatch, Maintenance, Energy.or(ExoticEnergy)) - .casingIndex(CASING_INDEX).dot(1).buildAndChain( - onElementPass( - GT_TileEntity_MegaDistillTower::onCasingFound, - ofBlock(GregTech_API.sBlockCasings4, 1)))) - .addElement('c', (IStructureElementCheckOnly<GT_TileEntity_MegaDistillTower>) (t, world, x, y, z) -> { - if (world.isAirBlock(x, y, z)) { - if (t.mTopState < 1) { - t.mTopState = 0; - return true; - } - // definitely top - cannot be air - return false; - } - // from here on we must be looking at a top layer, since it's not air - if (t.mTopState == 0) - // must be air but failed, so no - return false; - t.mTopState = 1; - // hatch adder - TileEntity tileEntity = world.getTileEntity(x, y, z); - if (tileEntity instanceof IGregTechTileEntity entity - && t.addLayerOutputHatch(entity, CASING_INDEX)) { - t.onTopLayerFound(false); - return true; - } - // block adder - if (world.getBlock(x, y, z) == GregTech_API.sBlockCasings4 - && world.getBlockMetadata(x, y, z) == 1) { - t.onTopLayerFound(true); + new String[][] { { "bbbbbbb~bbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", + "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", + "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", "bbbbbbbbbbbbbbb", + "bbbbbbbbbbbbbbb" }, })) + .addShape( + STRUCTURE_PIECE_LAYER, + transpose( + new String[][] { + { "lllllllllllllll", "lcccccccccccccl", "lcccccccccccccl", "lcccccccccccccl", "lcccccccccccccl", + "lcccccccccccccl", "lcccccccccccccl", "lcccccccccccccl", "lcccccccccccccl", + "lcccccccccccccl", "lcccccccccccccl", "lcccccccccccccl", "lcccccccccccccl", + "lcccccccccccccl", "lllllllllllllll" }, + { "lllllllllllllll", "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "lllllllllllllll" }, + { "lllllllllllllll", "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "lllllllllllllll" }, + { "lllllllllllllll", "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "lllllllllllllll" }, + { "lllllllllllllll", "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "lllllllllllllll" }, })) + .addShape( + STRUCTURE_PIECE_TOP_HINT, + transpose( + new String[][] { + { "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", + "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", + "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", "lllllllllllllll", + "lllllllllllllll", "lllllllllllllll" }, + { "lllllllllllllll", "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "lllllllllllllll" }, + { "lllllllllllllll", "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "lllllllllllllll" }, + { "lllllllllllllll", "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "lllllllllllllll" }, + { "lllllllllllllll", "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "l=============l", "l=============l", "l=============l", + "l=============l", "lllllllllllllll" }, })) + .addElement('=', StructureElementAirNoHint.getInstance()) + .addElement( + 'b', + buildHatchAdder(GT_TileEntity_MegaDistillTower.class) + .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy.or(ExoticEnergy)) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain( + onElementPass( + GT_TileEntity_MegaDistillTower::onCasingFound, + ofBlock(GregTech_API.sBlockCasings4, 1)))) + .addElement( + 'l', + buildHatchAdder(GT_TileEntity_MegaDistillTower.class) + .atLeast(layeredOutputHatch, Maintenance, Energy.or(ExoticEnergy)) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain( + onElementPass( + GT_TileEntity_MegaDistillTower::onCasingFound, + ofBlock(GregTech_API.sBlockCasings4, 1)))) + .addElement('c', (IStructureElementCheckOnly<GT_TileEntity_MegaDistillTower>) (t, world, x, y, z) -> { + if (world.isAirBlock(x, y, z)) { + if (t.mTopState < 1) { + t.mTopState = 0; return true; } + // definitely top - cannot be air + return false; + } + // from here on we must be looking at a top layer, since it's not air + if (t.mTopState == 0) + // must be air but failed, so no return false; - }).build(); + t.mTopState = 1; + // hatch adder + TileEntity tileEntity = world.getTileEntity(x, y, z); + if (tileEntity instanceof IGregTechTileEntity entity && t.addLayerOutputHatch(entity, CASING_INDEX)) { + t.onTopLayerFound(false); + return true; + } + // block adder + if (world.getBlock(x, y, z) == GregTech_API.sBlockCasings4 && world.getBlockMetadata(x, y, z) == 1) { + t.onTopLayerFound(true); + return true; + } + return false; + }) + .build(); } protected final List<List<GT_MetaTileEntity_Hatch_Output>> mOutputHatchesByLayer = new ArrayList<>(); @@ -212,17 +206,18 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock protected int getCurrentLayerOutputHatchCount() { return this.mOutputHatchesByLayer.size() < this.mHeight || this.mHeight <= 0 ? 0 - : this.mOutputHatchesByLayer.get(this.mHeight - 1).size(); + : this.mOutputHatchesByLayer.get(this.mHeight - 1) + .size(); } protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null || aTileEntity.isDead() - || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output)) - return false; + || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output)) return false; while (this.mOutputHatchesByLayer.size() < this.mHeight) this.mOutputHatchesByLayer.add(new ArrayList<>()); GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aTileEntity.getMetaTileEntity(); tHatch.updateTexture(aBaseCasingIndex); - return this.mOutputHatchesByLayer.get(this.mHeight - 1).add(tHatch); + return this.mOutputHatchesByLayer.get(this.mHeight - 1) + .add(tHatch); } protected void onTopLayerFound(boolean aIsCasing) { @@ -232,16 +227,27 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DISTILLATION_TOWER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_GLOW).extFacing().glow() - .build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DISTILLATION_TOWER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX) }; } @@ -259,17 +265,22 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Distillery").addInfo("Controller block for the Distillation Tower") - .addInfo("Fluids are only put out at the correct height") - .addInfo("The correct height equals the slot number in the NEI recipe").addSeparator() - .beginVariableStructureBlock(15, 15, 16, 56, 15, 15, true).addController("Front bottom") - .addOtherStructurePart("Clean Stainless Steel Machine Casing", "15 x h - 5 (minimum)") - .addEnergyHatch("Any casing").addMaintenanceHatch("Any casing").addInputHatch("Any bottom layer casing") - .addOutputBus("Any bottom layer casing") - .addOutputHatch("2-11x Output Hatches (One per Output Layer except bottom layer)") - .addStructureInfo("An \"Output Layer\" consists of 5 layers!") - .addStructureHint("The interior of this Mega Multiblock's hologram is empty, it should be all air.") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); + tt.addMachineType("Distillery") + .addInfo("Controller block for the Distillation Tower") + .addInfo("Fluids are only put out at the correct height") + .addInfo("The correct height equals the slot number in the NEI recipe") + .addSeparator() + .beginVariableStructureBlock(15, 15, 16, 56, 15, 15, true) + .addController("Front bottom") + .addOtherStructurePart("Clean Stainless Steel Machine Casing", "15 x h - 5 (minimum)") + .addEnergyHatch("Any casing") + .addMaintenanceHatch("Any casing") + .addInputHatch("Any bottom layer casing") + .addOutputBus("Any bottom layer casing") + .addOutputHatch("2-11x Output Hatches (One per Output Layer except bottom layer)") + .addStructureInfo("An \"Output Layer\" consists of 5 layers!") + .addStructureHint("The interior of this Mega Multiblock's hologram is empty, it should be all air.") + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); return tt; } @@ -294,8 +305,8 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock if (!checkPiece(STRUCTURE_PIECE_LAYER, 7, mHeight * 5, 0)) { return false; } - if (this.mOutputHatchesByLayer.size() < this.mHeight - || this.mOutputHatchesByLayer.get(this.mHeight - 1).isEmpty()) + if (this.mOutputHatchesByLayer.size() < this.mHeight || this.mOutputHatchesByLayer.get(this.mHeight - 1) + .isEmpty()) // layer without output hatch return false; if (mTopLayerFound) { @@ -308,8 +319,8 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock // validate final invariants... return this.mCasing >= 75 * this.mHeight + 10 && this.mHeight >= 2 - && this.mTopLayerFound - && this.mMaintenanceHatches.size() == 1; + && this.mTopLayerFound + && this.mMaintenanceHatches.size() == 1; } @Override @@ -328,27 +339,13 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock int realBudget = elementBudget >= 200 ? elementBudget : Math.min(200, elementBudget * 5); this.mHeight = 0; int built = this - .survivialBuildPiece(STRUCTURE_PIECE_BASE, stackSize, 7, 0, 0, realBudget, source, actor, false, true); + .survivialBuildPiece(STRUCTURE_PIECE_BASE, stackSize, 7, 0, 0, realBudget, source, actor, false, true); if (built >= 0) return built; int tTotalHeight = Math.min(12, stackSize.stackSize + 2); // min 2 output layer, so at least 1 + 2 height for (int i = 1; i < tTotalHeight - 1; i++) { this.mHeight = i; built = this.survivialBuildPiece( - STRUCTURE_PIECE_LAYER, - stackSize, - 7, - 5 * this.mHeight, - 0, - realBudget, - source, - actor, - false, - true); - if (built >= 0) return built; - } - this.mHeight = tTotalHeight - 1; - return this.survivialBuildPiece( - STRUCTURE_PIECE_TOP_HINT, + STRUCTURE_PIECE_LAYER, stackSize, 7, 5 * this.mHeight, @@ -358,6 +355,20 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock actor, false, true); + if (built >= 0) return built; + } + this.mHeight = tTotalHeight - 1; + return this.survivialBuildPiece( + STRUCTURE_PIECE_TOP_HINT, + stackSize, + 7, + 5 * this.mHeight, + 0, + realBudget, + source, + actor, + false, + true); } @Override @@ -370,7 +381,7 @@ public class GT_TileEntity_MegaDistillTower extends GT_TileEntity_MegaMultiBlock @Override public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, - float aX, float aY, float aZ) { + float aX, float aY, float aZ) { if (aPlayer.isSneaking()) { this.batchMode = !this.batchMode; if (this.batchMode) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaMultiBlockBase.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaMultiBlockBase.java index 700dbb8e36..223ef65f77 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaMultiBlockBase.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaMultiBlockBase.java @@ -25,7 +25,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffl import gregtech.api.util.GT_Utility; public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_MegaMultiBlockBase<T>> - extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T> { + extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T> { protected GT_TileEntity_MegaMultiBlockBase(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -51,8 +51,10 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M protected long[] getCurrentInfoData() { long storedEnergy = 0, maxEnergy = 0; for (GT_MetaTileEntity_Hatch hatch : this.getExoticAndNormalEnergyHatchList()) { - storedEnergy += hatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += hatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += hatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += hatch.getBaseMetaTileEntity() + .getEUCapacity(); } return new long[] { storedEnergy, maxEnergy }; } @@ -70,8 +72,10 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M long maxEnergy = ttHatches[1]; for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } long nominalV = this.getMaxInputEu(); @@ -81,59 +85,59 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M String[] extendedInfo = this.getExtendedInfoData(); String[] baseInfo = { - StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " - + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(this.mProgresstime / 20) - + EnumChatFormatting.RESET - + " s / " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.mMaxProgresstime / 20) - + EnumChatFormatting.RESET - + " s", - StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " - + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(storedEnergy) - + EnumChatFormatting.RESET - + " EU / " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEnergy) - + EnumChatFormatting.RESET - + " EU", - StatCollector.translateToLocal("GT5U.multiblock.usage") + ": " - + EnumChatFormatting.RED - + GT_Utility.formatNumbers(-this.lEUt) - + EnumChatFormatting.RESET - + " EU/t", - StatCollector.translateToLocal("GT5U.multiblock.mei") + ": " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getMaxInputVoltage()) - + EnumChatFormatting.RESET - + " EU/t(*" - + GT_Utility.formatNumbers(this.getMaxInputAmps()) - + "A) = " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(nominalV) - + EnumChatFormatting.RESET, - StatCollector.translateToLocal("GT5U.machines.tier") + ": " - + EnumChatFormatting.YELLOW - + tName - + EnumChatFormatting.RESET, - StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " - + EnumChatFormatting.RED - + (this.getIdealStatus() - this.getRepairStatus()) - + EnumChatFormatting.RESET - + " " - + StatCollector.translateToLocal("GT5U.multiblock.efficiency") - + ": " - + EnumChatFormatting.YELLOW - + this.mEfficiency / 100.0F - + EnumChatFormatting.RESET - + " %", - StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " - + EnumChatFormatting.GREEN - + mPollutionReduction - + EnumChatFormatting.RESET - + " %" }; + StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(this.mProgresstime / 20) + + EnumChatFormatting.RESET + + " s / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(this.mMaxProgresstime / 20) + + EnumChatFormatting.RESET + + " s", + StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + + EnumChatFormatting.GREEN + + GT_Utility.formatNumbers(storedEnergy) + + EnumChatFormatting.RESET + + " EU / " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(maxEnergy) + + EnumChatFormatting.RESET + + " EU", + StatCollector.translateToLocal("GT5U.multiblock.usage") + ": " + + EnumChatFormatting.RED + + GT_Utility.formatNumbers(-this.lEUt) + + EnumChatFormatting.RESET + + " EU/t", + StatCollector.translateToLocal("GT5U.multiblock.mei") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(this.getMaxInputVoltage()) + + EnumChatFormatting.RESET + + " EU/t(*" + + GT_Utility.formatNumbers(this.getMaxInputAmps()) + + "A) = " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(nominalV) + + EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.machines.tier") + ": " + + EnumChatFormatting.YELLOW + + tName + + EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " + + EnumChatFormatting.RED + + (this.getIdealStatus() - this.getRepairStatus()) + + EnumChatFormatting.RESET + + " " + + StatCollector.translateToLocal("GT5U.multiblock.efficiency") + + ": " + + EnumChatFormatting.YELLOW + + this.mEfficiency / 100.0F + + EnumChatFormatting.RESET + + " %", + StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " + + EnumChatFormatting.GREEN + + mPollutionReduction + + EnumChatFormatting.RESET + + " %" }; String[] combinedInfo = Arrays.copyOf(baseInfo, baseInfo.length + extendedInfo.length + 1); @@ -190,13 +194,8 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M public boolean spawnHint(T o, World world, int x, int y, int z, ItemStack trigger) { if (world.blockExists(x, y, z) && !world.isAirBlock(x, y, z)) // hint if this is obstructed. in case *someone* ever finish the transparent rendering - StructureLibAPI.hintParticle( - world, - x, - y, - z, - StructureLibAPI.getBlockHint(), - StructureLibAPI.HINT_BLOCK_META_AIR); + StructureLibAPI + .hintParticle(world, x, y, z, StructureLibAPI.getBlockHint(), StructureLibAPI.HINT_BLOCK_META_AIR); return true; } @@ -208,13 +207,13 @@ public abstract class GT_TileEntity_MegaMultiBlockBase<T extends GT_TileEntity_M @Override public BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, ItemStack trigger, - AutoPlaceEnvironment env) { + AutoPlaceEnvironment env) { return BlocksToPlace.createEmpty(); } @Override public PlaceResult survivalPlaceBlock(T o, World world, int x, int y, int z, ItemStack trigger, - AutoPlaceEnvironment env) { + AutoPlaceEnvironment env) { if (this.check(o, world, x, y, z)) return PlaceResult.SKIP; if (!StructureLibAPI.isBlockTriviallyReplaceable(world, x, y, z, env.getActor())) return PlaceResult.REJECT; world.setBlock(x, y, z, Blocks.air, 0, 2); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java index 6e4a0276db..40ec9f814b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaOilCracker.java @@ -70,74 +70,62 @@ import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Input_ME; import gregtech.common.tileentities.machines.IRecipeProcessingAwareHatch; public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBase<GT_TileEntity_MegaOilCracker> - implements ISurvivalConstructable { + implements ISurvivalConstructable { private static final int CASING_INDEX = 49; private static final String STRUCTURE_PIECE_MAIN = "main"; private static final IStructureDefinition<GT_TileEntity_MegaOilCracker> STRUCTURE_DEFINITION = StructureDefinition - .<GT_TileEntity_MegaOilCracker>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { - { " p p ", "ppgggggggggpp", " pgggggggggp ", " pgggpppgggp ", - " pgggpMpgggp ", " pgggpppgggp ", " pgggggggggp ", "ppgggggggggpp", - " p p " }, - { " p p ", "pgggggggggggp", " g c c c c g ", " g c c c c g ", - " g c c c c g ", " g c c c c g ", " g c c c c g ", "pgggggggggggp", - " p p " }, - { " p p ", "pgggggggggggp", " g c c c c g ", " p c c p ", - " p c c c c p ", " p c c p ", " g c c c c g ", "pgggggggggggp", - " p p " }, - { " p p ", "pgggggggggggp", " g c c c c g ", " p c c c c p ", - " l c c c c r ", " p c c c c p ", " g c c c c g ", "pgggggggggggp", - " p p " }, - { " p p ", "pgggggggggggp", " g c c c c g ", " p c c p ", - " p c c c c p ", " p c c p ", " g c c c c g ", "pgggggggggggp", - " p p " }, - { " p p ", "pgggggggggggp", " g c c c c g ", " g c c c c g ", - " g c c c c g ", " g c c c c g ", " g c c c c g ", "pgggggggggggp", - " p p " }, - { "ppmmmm~mmmmpp", "ppppppppppppp", "ppppppppppppp", "ppppppppppppp", - "ppppppppppppp", "ppppppppppppp", "ppppppppppppp", "ppppppppppppp", - "ppmmmmmmmmmpp" }, })) - .addElement( - 'c', - withChannel( - "coil", - ofCoil( - GT_TileEntity_MegaOilCracker::setCoilLevel, - GT_TileEntity_MegaOilCracker::getCoilLevel))) - - .addElement('p', ofBlock(GregTech_API.sBlockCasings4, 1)) - .addElement( - 'l', - InputHatch.withAdder(GT_TileEntity_MegaOilCracker::addLeftHatchToMachineList) - .newAny(CASING_INDEX, 2)) - .addElement( - 'r', - OutputHatch.withAdder(GT_TileEntity_MegaOilCracker::addRightHatchToMachineList) - .newAny(CASING_INDEX, 3)) - .addElement( - 'm', - buildHatchAdder(GT_TileEntity_MegaOilCracker.class) - .atLeast(Energy.or(ExoticEnergy), Maintenance, InputBus).casingIndex(CASING_INDEX).dot(1) - .buildAndChain(GregTech_API.sBlockCasings4, 1)) - .addElement( - 'M', - InputHatch.withAdder(GT_TileEntity_MegaOilCracker::addMiddleInputToMachineList) - .newAny(CASING_INDEX, 4)) - .addElement( - 'g', - withChannel( - "glass", - BorosilicateGlass.ofBoroGlass( - (byte) 0, - (byte) 1, - Byte.MAX_VALUE, - (te, t) -> te.glassTier = t, - te -> te.glassTier))) - .build(); + .<GT_TileEntity_MegaOilCracker>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { + { " p p ", "ppgggggggggpp", " pgggggggggp ", " pgggpppgggp ", " pgggpMpgggp ", + " pgggpppgggp ", " pgggggggggp ", "ppgggggggggpp", " p p " }, + { " p p ", "pgggggggggggp", " g c c c c g ", " g c c c c g ", " g c c c c g ", + " g c c c c g ", " g c c c c g ", "pgggggggggggp", " p p " }, + { " p p ", "pgggggggggggp", " g c c c c g ", " p c c p ", " p c c c c p ", + " p c c p ", " g c c c c g ", "pgggggggggggp", " p p " }, + { " p p ", "pgggggggggggp", " g c c c c g ", " p c c c c p ", " l c c c c r ", + " p c c c c p ", " g c c c c g ", "pgggggggggggp", " p p " }, + { " p p ", "pgggggggggggp", " g c c c c g ", " p c c p ", " p c c c c p ", + " p c c p ", " g c c c c g ", "pgggggggggggp", " p p " }, + { " p p ", "pgggggggggggp", " g c c c c g ", " g c c c c g ", " g c c c c g ", + " g c c c c g ", " g c c c c g ", "pgggggggggggp", " p p " }, + { "ppmmmm~mmmmpp", "ppppppppppppp", "ppppppppppppp", "ppppppppppppp", "ppppppppppppp", + "ppppppppppppp", "ppppppppppppp", "ppppppppppppp", "ppmmmmmmmmmpp" }, })) + .addElement( + 'c', + withChannel( + "coil", + ofCoil(GT_TileEntity_MegaOilCracker::setCoilLevel, GT_TileEntity_MegaOilCracker::getCoilLevel))) + + .addElement('p', ofBlock(GregTech_API.sBlockCasings4, 1)) + .addElement( + 'l', + InputHatch.withAdder(GT_TileEntity_MegaOilCracker::addLeftHatchToMachineList) + .newAny(CASING_INDEX, 2)) + .addElement( + 'r', + OutputHatch.withAdder(GT_TileEntity_MegaOilCracker::addRightHatchToMachineList) + .newAny(CASING_INDEX, 3)) + .addElement( + 'm', + buildHatchAdder(GT_TileEntity_MegaOilCracker.class).atLeast(Energy.or(ExoticEnergy), Maintenance, InputBus) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain(GregTech_API.sBlockCasings4, 1)) + .addElement( + 'M', + InputHatch.withAdder(GT_TileEntity_MegaOilCracker::addMiddleInputToMachineList) + .newAny(CASING_INDEX, 4)) + .addElement( + 'g', + withChannel( + "glass", + BorosilicateGlass + .ofBoroGlass((byte) 0, (byte) 1, Byte.MAX_VALUE, (te, t) -> te.glassTier = t, te -> te.glassTier))) + .build(); private byte glassTier; private HeatingCoilLevel heatLevel; protected final List<GT_MetaTileEntity_Hatch_Input> mMiddleInputHatches = new ArrayList<>(); @@ -155,21 +143,27 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa @Override public GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Cracker").addInfo("Controller block for the Mega Oil Cracking") - .addInfo("Thermally cracks heavy hydrocarbons into lighter fractions") - .addInfo("More efficient than the Chemical Reactor") - .addInfo("Gives different benefits whether it hydro or steam-cracks:") - .addInfo("Hydro - Consumes 20% less Hydrogen and outputs 25% more cracked fluid") - .addInfo("Steam - Outputs 50% more cracked fluid") - .addInfo("(Values compared to cracking in the Chemical Reactor)") - .addInfo("Place the appropriate circuit in the controller or an input bus").addSeparator() - .beginStructureBlock(13, 7, 9, true).addController("Front bottom") - .addStructureInfo("The glass tier limits the Energy Input tier") - .addInfo("Gets 10% EU/t reduction per coil tier, up to a maximum of 50%") - .addEnergyHatch("Hint block", 1).addMaintenanceHatch("Hint block", 1).addInputHatch("Hint block", 2, 3) - .addOutputHatch("Hint block", 2, 3).addInputHatch("Steam/Hydrogen ONLY, Hint block", 4) - .addInputBus("Optional, for programmed circuit automation. Hint block", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + tt.addMachineType("Cracker") + .addInfo("Controller block for the Mega Oil Cracking") + .addInfo("Thermally cracks heavy hydrocarbons into lighter fractions") + .addInfo("More efficient than the Chemical Reactor") + .addInfo("Gives different benefits whether it hydro or steam-cracks:") + .addInfo("Hydro - Consumes 20% less Hydrogen and outputs 25% more cracked fluid") + .addInfo("Steam - Outputs 50% more cracked fluid") + .addInfo("(Values compared to cracking in the Chemical Reactor)") + .addInfo("Place the appropriate circuit in the controller or an input bus") + .addSeparator() + .beginStructureBlock(13, 7, 9, true) + .addController("Front bottom") + .addStructureInfo("The glass tier limits the Energy Input tier") + .addInfo("Gets 10% EU/t reduction per coil tier, up to a maximum of 50%") + .addEnergyHatch("Hint block", 1) + .addMaintenanceHatch("Hint block", 1) + .addInputHatch("Hint block", 2, 3) + .addOutputHatch("Hint block", 2, 3) + .addInputHatch("Steam/Hydrogen ONLY, Hint block", 4) + .addInputBus("Optional, for programmed circuit automation. Hint block", 1) + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); return tt; } @@ -180,15 +174,26 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { - if (aActive) return new ITexture[] { casingTexturePages[0][CASING_INDEX], - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { casingTexturePages[0][CASING_INDEX], - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW).extFacing().glow().build() }; + if (aActive) return new ITexture[] { casingTexturePages[0][CASING_INDEX], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { casingTexturePages[0][CASING_INDEX], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { casingTexturePages[0][CASING_INDEX] }; } @@ -206,7 +211,7 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa @Nonnull public CheckRecipeResult process() { this.setEuModifier( - 1.0F - Math.min(0.1F * (GT_TileEntity_MegaOilCracker.this.heatLevel.getTier() + 1), 0.5F)); + 1.0F - Math.min(0.1F * (GT_TileEntity_MegaOilCracker.this.heatLevel.getTier() + 1), 0.5F)); return super.process(); } }.setMaxParallel(ConfigHandler.megaMachinesMax); @@ -230,7 +235,7 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa if (this.mMachine) return -1; int realBudget = elementBudget >= 200 ? elementBudget : Math.min(200, elementBudget * 5); return this - .survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 6, 6, 0, realBudget, source, actor, false, true); + .survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 6, 6, 0, realBudget, source, actor, false, true); } // -------------- TEC TECH COMPAT ---------------- @@ -351,20 +356,22 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa tHatch.mRecipeMap = getRecipeMap(); if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) { for (FluidStack tFluid : meHatch.getStoredFluids()) { - if (tFluid != null && !getRecipeMap().getBackend().isValidCatalystFluid(tFluid)) { + if (tFluid != null && !getRecipeMap().getBackend() + .isValidCatalystFluid(tFluid)) { inputsFromME.put(tFluid.getFluid(), tFluid); } } } else if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput) { for (final FluidStack tFluid : ((GT_MetaTileEntity_Hatch_MultiInput) tHatch).getStoredFluid()) { - if (tFluid != null && !getRecipeMap().getBackend().isValidCatalystFluid(tFluid)) { + if (tFluid != null && !getRecipeMap().getBackend() + .isValidCatalystFluid(tFluid)) { rList.add(tFluid); } } } else { if (tHatch.getFillableStack() != null) { - if (!getRecipeMap().getBackend().isValidCatalystFluid(tHatch.getFillableStack())) - rList.add(tHatch.getFillableStack()); + if (!getRecipeMap().getBackend() + .isValidCatalystFluid(tHatch.getFillableStack())) rList.add(tHatch.getFillableStack()); } } } @@ -372,20 +379,23 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa tHatch.mRecipeMap = getRecipeMap(); if (tHatch instanceof GT_MetaTileEntity_Hatch_Input_ME meHatch) { for (FluidStack tFluid : meHatch.getStoredFluids()) { - if (tFluid != null && getRecipeMap().getBackend().isValidCatalystFluid(tFluid)) { + if (tFluid != null && getRecipeMap().getBackend() + .isValidCatalystFluid(tFluid)) { inputsFromME.put(tFluid.getFluid(), tFluid); } } } else if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput) { for (final FluidStack tFluid : ((GT_MetaTileEntity_Hatch_MultiInput) tHatch).getStoredFluid()) { - if (tFluid != null && getRecipeMap().getBackend().isValidCatalystFluid(tFluid)) { + if (tFluid != null && getRecipeMap().getBackend() + .isValidCatalystFluid(tFluid)) { rList.add(tFluid); } } } else { if (tHatch.getFillableStack() != null) { final FluidStack tStack = tHatch.getFillableStack(); - if (getRecipeMap().getBackend().isValidCatalystFluid(tStack)) { + if (getRecipeMap().getBackend() + .isValidCatalystFluid(tStack)) { rList.add(tStack); } } @@ -409,7 +419,7 @@ public class GT_TileEntity_MegaOilCracker extends GT_TileEntity_MegaMultiBlockBa @Override public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, - float aX, float aY, float aZ) { + float aX, float aY, float aZ) { if (aPlayer.isSneaking()) { batchMode = !batchMode; if (batchMode) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java index fce136840d..0a2464de5e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java @@ -51,7 +51,7 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; public class GT_TileEntity_MegaVacuumFreezer extends GT_TileEntity_MegaMultiBlockBase<GT_TileEntity_MegaVacuumFreezer> - implements ISurvivalConstructable { + implements ISurvivalConstructable { public GT_TileEntity_MegaVacuumFreezer(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -71,89 +71,84 @@ public class GT_TileEntity_MegaVacuumFreezer extends GT_TileEntity_MegaMultiBloc private static final int CASING_INDEX = 17; private static final String STRUCTURE_PIECE_MAIN = "main"; private static final IStructureDefinition<GT_TileEntity_MegaVacuumFreezer> STRUCTURE_DEFINITION = StructureDefinition - .<GT_TileEntity_MegaVacuumFreezer>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { - { "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", - "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", - "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", - "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccc~ccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "c=============c", "c=============c", - "c=============c", "c=============c", "ccccccccccccccc" }, - { "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", - "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", - "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", - "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc" } })) - .addElement('=', StructureElementAirNoHint.getInstance()) - .addElement( - 'c', - buildHatchAdder(GT_TileEntity_MegaVacuumFreezer.class) - .atLeast(Energy.or(ExoticEnergy), InputHatch, InputBus, OutputHatch, OutputBus, Maintenance) - .casingIndex(CASING_INDEX).dot(1) - .buildAndChain(onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings2, 1)))) - .build(); + .<GT_TileEntity_MegaVacuumFreezer>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { + { "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", + "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", + "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccc~ccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "c=============c", + "c=============c", "c=============c", "c=============c", "c=============c", "ccccccccccccccc" }, + { "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", + "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", + "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", "ccccccccccccccc", + "ccccccccccccccc" } })) + .addElement('=', StructureElementAirNoHint.getInstance()) + .addElement( + 'c', + buildHatchAdder(GT_TileEntity_MegaVacuumFreezer.class) + .atLeast(Energy.or(ExoticEnergy), InputHatch, InputBus, OutputHatch, OutputBus, Maintenance) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain(onElementPass(x -> x.mCasing++, ofBlock(GregTech_API.sBlockCasings2, 1)))) + .build(); @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Vacuum Freezer").addInfo("Controller Block for the Mega Vacuum Freezer") - .addInfo("Cools hot ingots and cells").addSeparator().beginStructureBlock(15, 15, 15, true) - .addController("Front center").addCasingInfoMin("Frost Proof Machine Casing", 900, false) - .addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1).addInputHatch("Any casing", 1) - .addOutputHatch("Any casing", 1).addInputBus("Any casing", 1).addOutputBus("Any casing", 1) - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); + tt.addMachineType("Vacuum Freezer") + .addInfo("Controller Block for the Mega Vacuum Freezer") + .addInfo("Cools hot ingots and cells") + .addSeparator() + .beginStructureBlock(15, 15, 15, true) + .addController("Front center") + .addCasingInfoMin("Frost Proof Machine Casing", 900, false) + .addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1) + .addInputHatch("Any casing", 1) + .addOutputHatch("Any casing", 1) + .addInputBus("Any casing", 1) + .addOutputBus("Any casing", 1) + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTWORKS); return tt; } @@ -172,7 +167,7 @@ public class GT_TileEntity_MegaVacuumFreezer extends GT_TileEntity_MegaMultiBloc if (this.mMachine) return -1; int realBudget = elementBudget >= 200 ? elementBudget : Math.min(200, elementBudget * 5); return this - .survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 7, 7, 0, realBudget, source, actor, false, true); + .survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 7, 7, 0, realBudget, source, actor, false, true); } @Override @@ -190,7 +185,7 @@ public class GT_TileEntity_MegaVacuumFreezer extends GT_TileEntity_MegaMultiBloc @Override public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, - float aX, float aY, float aZ) { + float aX, float aY, float aZ) { if (aPlayer.isSneaking()) { this.batchMode = !this.batchMode; if (this.batchMode) { @@ -219,19 +214,29 @@ public class GT_TileEntity_MegaVacuumFreezer extends GT_TileEntity_MegaMultiBloc @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { ITexture[] rTexture; if (side == facing) { if (aActive) { - rTexture = new ITexture[] { casingTexturePages[0][17], - TextureFactory.builder().addIcon(OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE_GLOW).extFacing().glow() - .build() }; + rTexture = new ITexture[] { casingTexturePages[0][17], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; } else { - rTexture = new ITexture[] { casingTexturePages[0][17], - TextureFactory.builder().addIcon(OVERLAY_FRONT_VACUUM_FREEZER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_VACUUM_FREEZER_GLOW).extFacing().glow() - .build() }; + rTexture = new ITexture[] { casingTexturePages[0][17], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_VACUUM_FREEZER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_VACUUM_FREEZER_GLOW) + .extFacing() + .glow() + .build() }; } } else { rTexture = new ITexture[] { casingTexturePages[0][17] }; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_AcidGenerator.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_AcidGenerator.java index d9b7645d29..c50e6cbd12 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_AcidGenerator.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_AcidGenerator.java @@ -32,7 +32,7 @@ import gregtech.api.render.TextureFactory; public class GT_MetaTileEntity_AcidGenerator extends GT_MetaTileEntity_BasicGenerator { public GT_MetaTileEntity_AcidGenerator(int aID, String aName, String aNameRegional, int aTier, - ITexture... aTextures) { + ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, new String[] {}, aTextures); } @@ -63,93 +63,95 @@ public class GT_MetaTileEntity_AcidGenerator extends GT_MetaTileEntity_BasicGene @Override public ITexture[] getFront(byte aColor) { return new ITexture[] { super.getFront(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL), - Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; + TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL), + Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; } @Override public ITexture[] getBack(byte aColor) { return new ITexture[] { super.getBack(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; + TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; } @Override public ITexture[] getBottom(byte aColor) { return new ITexture[] { super.getBottom(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; + TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; } @Override public ITexture[] getTop(byte aColor) { return new ITexture[] { super.getTop(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL), - TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT")), - TextureFactory.builder() - .addIcon( - new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT_GLOW")) - .glow().build() }; + TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL), + TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT")), + TextureFactory.builder() + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT_GLOW")) + .glow() + .build() }; } @Override public ITexture[] getSides(byte aColor) { return new ITexture[] { super.getSides(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; + TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; } @Override public ITexture[] getFrontActive(byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL), - Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; + TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL), + Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; } @Override public ITexture[] getBackActive(byte aColor) { return new ITexture[] { super.getBackActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; + TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; } @Override public ITexture[] getBottomActive(byte aColor) { return new ITexture[] { super.getBottomActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; + TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; } @Override public ITexture[] getTopActive(byte aColor) { return new ITexture[] { super.getTopActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL), - TextureFactory - .of(new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT_ACTIVE")), - TextureFactory.builder().addIcon( - new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT_ACTIVE_GLOW")) - .glow().build() }; + TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL), + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT_ACTIVE")), + TextureFactory.builder() + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT_ACTIVE_GLOW")) + .glow() + .build() }; } @Override public ITexture[] getSidesActive(byte aColor) { return new ITexture[] { super.getSidesActive(aColor)[0], - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; + TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD) }; } @Override public boolean isOutputFacing(ForgeDirection side) { - return side == this.getBaseMetaTileEntity().getFrontFacing(); + return side == this.getBaseMetaTileEntity() + .getFrontFacing(); } @Override public String[] getDescription() { return new String[] { StatCollector.translateToLocal("tooltip.tile.acidgen.0.name"), - StatCollector.translateToLocal("tooltip.tile.acidgen.1.name"), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.0.name") + " " - + ChatColorHelper.YELLOW - + GT_Values.V[this.mTier], - StatCollector.translateToLocal("tooltip.rotor.2.name") + " " - + ChatColorHelper.YELLOW - + this.getEfficiency(), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.2.name") + " " - + ChatColorHelper.YELLOW - + this.maxAmperesOut(), - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }; + StatCollector.translateToLocal("tooltip.tile.acidgen.1.name"), + StatCollector.translateToLocal("tooltip.tile.tiereddsc.0.name") + " " + + ChatColorHelper.YELLOW + + GT_Values.V[this.mTier], + StatCollector.translateToLocal("tooltip.rotor.2.name") + " " + + ChatColorHelper.YELLOW + + this.getEfficiency(), + StatCollector.translateToLocal("tooltip.tile.tiereddsc.2.name") + " " + + ChatColorHelper.YELLOW + + this.maxAmperesOut(), + BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java index 30420d4328..d2ef329066 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java @@ -60,83 +60,81 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine { public GT_MetaTileEntity_BioLab(int aID, String aName, String aNameRegional, int aTier) { super( - aID, - aName, - aNameRegional, - aTier, - 1, - (String) null, - 6, - 2, - TextureFactory.of( - TextureFactory.of( - new Textures.BlockIcons.CustomIcon( - "basicmachines/fluid_extractor/OVERLAY_SIDE_ACTIVE")), - TextureFactory.builder() - .addIcon( - new Textures.BlockIcons.CustomIcon( - "basicmachines/fluid_extractor/OVERLAY_SIDE_ACTIVE_GLOW")) - .glow().build()), - TextureFactory.of( - TextureFactory - .of(new Textures.BlockIcons.CustomIcon("basicmachines/fluid_extractor/OVERLAY_SIDE")), - TextureFactory.builder().addIcon( - new Textures.BlockIcons.CustomIcon("basicmachines/fluid_extractor/OVERLAY_SIDE_GLOW")) - .glow().build()), - TextureFactory.of( - TextureFactory - .of(new Textures.BlockIcons.CustomIcon("basicmachines/microwave/OVERLAY_FRONT_ACTIVE")), - TextureFactory.builder().addIcon( - new Textures.BlockIcons.CustomIcon("basicmachines/microwave/OVERLAY_FRONT_ACTIVE_GLOW")) - .glow().build()), - TextureFactory.of( - TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/microwave/OVERLAY_FRONT")), - TextureFactory.builder().addIcon( - new Textures.BlockIcons.CustomIcon("basicmachines/microwave/OVERLAY_FRONT_GLOW")).glow() - .build()), - TextureFactory.of( - TextureFactory.of( - new Textures.BlockIcons.CustomIcon( - "basicmachines/chemical_reactor/OVERLAY_FRONT_ACTIVE")), - TextureFactory.builder() - .addIcon( - new Textures.BlockIcons.CustomIcon( - "basicmachines/chemical_reactor/OVERLAY_FRONT_ACTIVE_GLOW")) - .glow().build() /* this is topactive */), - TextureFactory.of( - TextureFactory - .of(new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT")), - TextureFactory.builder().addIcon( - new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT_GLOW")) - .glow().build() /* this is top */), - TextureFactory.of( - TextureFactory.of( - new Textures.BlockIcons.CustomIcon("basicmachines/polarizer/OVERLAY_BOTTOM_ACTIVE")), - TextureFactory.builder() - .addIcon( - new Textures.BlockIcons.CustomIcon( - "basicmachines/polarizer/OVERLAY_BOTTOM_ACTIVE_GLOW")) - .glow().build()), - TextureFactory.of( - TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/polarizer/OVERLAY_BOTTOM")), - TextureFactory.builder().addIcon( - new Textures.BlockIcons.CustomIcon("basicmachines/polarizer/OVERLAY_BOTTOM_GLOW")) - .glow().build())); + aID, + aName, + aNameRegional, + aTier, + 1, + (String) null, + 6, + 2, + TextureFactory.of( + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/fluid_extractor/OVERLAY_SIDE_ACTIVE")), + TextureFactory.builder() + .addIcon( + new Textures.BlockIcons.CustomIcon("basicmachines/fluid_extractor/OVERLAY_SIDE_ACTIVE_GLOW")) + .glow() + .build()), + TextureFactory.of( + TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/fluid_extractor/OVERLAY_SIDE")), + TextureFactory.builder() + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/fluid_extractor/OVERLAY_SIDE_GLOW")) + .glow() + .build()), + TextureFactory.of( + TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/microwave/OVERLAY_FRONT_ACTIVE")), + TextureFactory.builder() + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/microwave/OVERLAY_FRONT_ACTIVE_GLOW")) + .glow() + .build()), + TextureFactory.of( + TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/microwave/OVERLAY_FRONT")), + TextureFactory.builder() + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/microwave/OVERLAY_FRONT_GLOW")) + .glow() + .build()), + TextureFactory.of( + TextureFactory + .of(new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT_ACTIVE")), + TextureFactory.builder() + .addIcon( + new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT_ACTIVE_GLOW")) + .glow() + .build() /* this is topactive */), + TextureFactory.of( + TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT")), + TextureFactory.builder() + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/chemical_reactor/OVERLAY_FRONT_GLOW")) + .glow() + .build() /* this is top */), + TextureFactory.of( + TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/polarizer/OVERLAY_BOTTOM_ACTIVE")), + TextureFactory.builder() + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/polarizer/OVERLAY_BOTTOM_ACTIVE_GLOW")) + .glow() + .build()), + TextureFactory.of( + TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/polarizer/OVERLAY_BOTTOM")), + TextureFactory.builder() + .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/polarizer/OVERLAY_BOTTOM_GLOW")) + .glow() + .build())); } public GT_MetaTileEntity_BioLab(String aName, int aTier, int aAmperage, String[] aDescription, - ITexture[][][] aTextures) { + ITexture[][][] aTextures) { super(aName, aTier, aAmperage, aDescription, aTextures, 6, 2); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { return new GT_MetaTileEntity_BioLab( - this.mName, - this.mTier, - this.mAmperage, - this.mDescriptionArray, - this.mTextures); + this.mName, + this.mTier, + this.mAmperage, + this.mDescriptionArray, + this.mTextures); } @Override @@ -154,37 +152,39 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine { int rTier = 3; FluidStack dnaFluid = Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 1000) - : Materials.Biomass.getFluid(1000L); + : Materials.Biomass.getFluid(1000L); - if (this.getSpecialSlot() != null && this.getSpecialSlot().getItem() instanceof LabModule) { - int damage = this.getSpecialSlot().getItemDamage(); + if (this.getSpecialSlot() != null && this.getSpecialSlot() + .getItem() instanceof LabModule) { + int damage = this.getSpecialSlot() + .getItemDamage(); switch (damage) { case DNA_EXTRACTION_MODULE: if (GT_Utility.isStackValid(this.mInventory[this.getInputSlot()]) - && this.mInventory[this.getInputSlot()].getItem() instanceof LabParts - && this.mInventory[this.getInputSlot()].getItemDamage() == 0 - && this.mInventory[this.getInputSlot()].getTagCompound() != null - && // checks if it is a Culture - GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 1]) - && this.mInventory[this.getInputSlot() + 1].getItem() instanceof LabParts - && this.mInventory[this.getInputSlot() + 1].getItemDamage() == 1 - && this.mInventory[this.getInputSlot() + 1].getTagCompound() == null - && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 2]) - && this.mInventory[this.getInputSlot() + 2].getItem() instanceof LabParts - && this.mInventory[this.getInputSlot() + 2].getItemDamage() == 3 - && GT_Utility.areStacksEqual( - this.mInventory[this.getInputSlot() + 3], - Materials.Ethanol.getCells(1)) - && this.mFluid != null - && this.mFluid.isFluidEqual(FluidRegistry.getFluidStack("ic2distilledwater", 1000)) - && this.mFluid.amount >= 1000) { + && this.mInventory[this.getInputSlot()].getItem() instanceof LabParts + && this.mInventory[this.getInputSlot()].getItemDamage() == 0 + && this.mInventory[this.getInputSlot()].getTagCompound() != null + && // checks if it is a Culture + GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 1]) + && this.mInventory[this.getInputSlot() + 1].getItem() instanceof LabParts + && this.mInventory[this.getInputSlot() + 1].getItemDamage() == 1 + && this.mInventory[this.getInputSlot() + 1].getTagCompound() == null + && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 2]) + && this.mInventory[this.getInputSlot() + 2].getItem() instanceof LabParts + && this.mInventory[this.getInputSlot() + 2].getItemDamage() == 3 + && GT_Utility + .areStacksEqual(this.mInventory[this.getInputSlot() + 3], Materials.Ethanol.getCells(1)) + && this.mFluid != null + && this.mFluid.isFluidEqual(FluidRegistry.getFluidStack("ic2distilledwater", 1000)) + && this.mFluid.amount >= 1000) { NBTTagCompound DNABioDataTag = this.mInventory[this.getInputSlot()].getTagCompound() - .getCompoundTag("DNA"); + .getCompoundTag("DNA"); if (DNABioDataTag == null) return super.checkRecipe(skipOC); BioData cultureDNABioData = BioData.getBioDataFromName( - this.mInventory[this.getInputSlot()].getTagCompound().getCompoundTag("DNA") - .getString("Name")); + this.mInventory[this.getInputSlot()].getTagCompound() + .getCompoundTag("DNA") + .getString("Name")); if (cultureDNABioData == null) return super.checkRecipe(skipOC); if (this.mTier < rTier + cultureDNABioData.getTier()) @@ -199,37 +199,34 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine { if (cultureDNABioData.getChance() > new XSTR().nextInt(10000)) { this.mOutputItems[0] = BioItemList - .getDNASampleFlask(BioDNA.convertDataToDNA(cultureDNABioData)); + .getDNASampleFlask(BioDNA.convertDataToDNA(cultureDNABioData)); } this.mOutputItems[1] = GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L); this.calculateOverclockedNess( - BW_Util.getMachineVoltageFromTier(rTier + cultureDNABioData.getTier()), - 500); + BW_Util.getMachineVoltageFromTier(rTier + cultureDNABioData.getTier()), + 500); return GT_MetaTileEntity_BasicMachine.FOUND_AND_SUCCESSFULLY_USED_RECIPE; } break; case PCR_THERMOCYCLE_MODULE: { if (GT_Utility.isStackValid(this.mInventory[this.getInputSlot()]) - && this.mInventory[this.getInputSlot()].getItem() instanceof LabParts - && this.mInventory[this.getInputSlot()].getItemDamage() == 1 - && this.mInventory[this.getInputSlot()].getTagCompound() != null - && // checks if it is a Culture - GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 3]) - && GT_Utility.areStacksEqual( - this.mInventory[this.getInputSlot() + 3], - ItemList.Tool_DataOrb.get(1L)) - && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 1]) - && GT_Utility.areStacksEqual( - this.mInventory[this.getInputSlot() + 1], - FluidLoader.BioLabFluidCells[0]) - && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 2]) - && GT_Utility.areStacksEqual( - this.mInventory[this.getInputSlot() + 2], - FluidLoader.BioLabFluidCells[3]) - && this.mFluid != null - && this.mFluid.isFluidEqual(dnaFluid) - && this.mFluid.amount >= 1000) { + && this.mInventory[this.getInputSlot()].getItem() instanceof LabParts + && this.mInventory[this.getInputSlot()].getItemDamage() == 1 + && this.mInventory[this.getInputSlot()].getTagCompound() != null + && // checks if it is a Culture + GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 3]) + && GT_Utility + .areStacksEqual(this.mInventory[this.getInputSlot() + 3], ItemList.Tool_DataOrb.get(1L)) + && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 1]) + && GT_Utility + .areStacksEqual(this.mInventory[this.getInputSlot() + 1], FluidLoader.BioLabFluidCells[0]) + && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 2]) + && GT_Utility + .areStacksEqual(this.mInventory[this.getInputSlot() + 2], FluidLoader.BioLabFluidCells[3]) + && this.mFluid != null + && this.mFluid.isFluidEqual(dnaFluid) + && this.mFluid.amount >= 1000) { NBTTagCompound DNABioDataTag = this.mInventory[this.getInputSlot()].getTagCompound(); if (DNABioDataTag == null) return super.checkRecipe(skipOC); BioData cultureDNABioData = BioData.getBioDataFromName(DNABioDataTag.getString("Name")); @@ -255,8 +252,8 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine { this.mOutputItems[1] = ItemList.Cell_Empty.get(2L); this.calculateOverclockedNess( - BW_Util.getMachineVoltageFromTier(1 + rTier + cultureDNABioData.getTier()), - 500); + BW_Util.getMachineVoltageFromTier(1 + rTier + cultureDNABioData.getTier()), + 500); return GT_MetaTileEntity_BasicMachine.FOUND_AND_SUCCESSFULLY_USED_RECIPE; } @@ -266,32 +263,33 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine { ItemStack inp2 = ItemList.Tool_DataOrb.get(1L); Behaviour_DataOrb.setDataTitle(inp2, "DNA Sample"); Behaviour_DataOrb.setDataName(inp2, BioCultureLoader.BIO_DATA_BETA_LACMATASE.getName()); - if (GT_Utility.isStackValid(this.mInventory[this.getInputSlot()]) && GT_Utility - .areStacksEqual(FluidLoader.BioLabFluidCells[1], this.mInventory[this.getInputSlot()]) && // checks - // if - // it - // is - // a - // Culture - GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 1]) - && GT_Utility.areStacksEqual( - this.mInventory[this.getInputSlot() + 1], - BioItemList.getPlasmidCell(null)) - && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 2]) - && GT_Utility.areStacksEqual( - this.mInventory[this.getInputSlot() + 2], - ItemList.Tool_DataOrb.get(1L), - true) - && "DNA Sample" - .equals(Behaviour_DataOrb.getDataTitle(this.mInventory[this.getInputSlot() + 2])) - && !Behaviour_DataOrb.getDataName(this.mInventory[this.getInputSlot() + 2]).isEmpty() - && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 3]) - && GT_Utility.areStacksEqual(this.mInventory[this.getInputSlot() + 3], inp2) - && this.mFluid != null - && this.mFluid.isFluidEqual(dnaFluid) - && this.mFluid.amount >= 1000) { + if (GT_Utility.isStackValid(this.mInventory[this.getInputSlot()]) + && GT_Utility + .areStacksEqual(FluidLoader.BioLabFluidCells[1], this.mInventory[this.getInputSlot()]) + && // checks + // if + // it + // is + // a + // Culture + GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 1]) + && GT_Utility + .areStacksEqual(this.mInventory[this.getInputSlot() + 1], BioItemList.getPlasmidCell(null)) + && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 2]) + && GT_Utility.areStacksEqual( + this.mInventory[this.getInputSlot() + 2], + ItemList.Tool_DataOrb.get(1L), + true) + && "DNA Sample".equals(Behaviour_DataOrb.getDataTitle(this.mInventory[this.getInputSlot() + 2])) + && !Behaviour_DataOrb.getDataName(this.mInventory[this.getInputSlot() + 2]) + .isEmpty() + && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 3]) + && GT_Utility.areStacksEqual(this.mInventory[this.getInputSlot() + 3], inp2) + && this.mFluid != null + && this.mFluid.isFluidEqual(dnaFluid) + && this.mFluid.amount >= 1000) { BioData cultureDNABioData = BioData.getBioDataFromName( - Behaviour_DataOrb.getDataName(this.mInventory[this.getInputSlot() + 2])); + Behaviour_DataOrb.getDataName(this.mInventory[this.getInputSlot() + 2])); if (cultureDNABioData == null) return super.checkRecipe(skipOC); if (this.mTier < 1 + rTier + cultureDNABioData.getTier()) return GT_MetaTileEntity_BasicMachine.FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; @@ -302,37 +300,37 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine { this.mFluid.amount -= 1000; if (cultureDNABioData.getChance() > new XSTR().nextInt(10000)) { this.mOutputItems[0] = BioItemList - .getPlasmidCell(BioPlasmid.convertDataToPlasmid(cultureDNABioData)); + .getPlasmidCell(BioPlasmid.convertDataToPlasmid(cultureDNABioData)); } this.mOutputItems[1] = ItemList.Cell_Empty.get(1L); this.calculateOverclockedNess( - BW_Util.getMachineVoltageFromTier(1 + rTier + cultureDNABioData.getTier()), - 500); + BW_Util.getMachineVoltageFromTier(1 + rTier + cultureDNABioData.getTier()), + 500); return GT_MetaTileEntity_BasicMachine.FOUND_AND_SUCCESSFULLY_USED_RECIPE; } } break; case TRANSFORMATION_MODULE: { - if (GT_Utility.isStackValid(this.mInventory[this.getInputSlot()]) && GT_Utility + if (GT_Utility.isStackValid(this.mInventory[this.getInputSlot()]) + && GT_Utility .areStacksEqual(this.mInventory[this.getInputSlot()], BioItemList.getPetriDish(null), true) - && this.mInventory[this.getInputSlot()].getTagCompound() != null - && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 1]) - && GT_Utility.areStacksEqual( - this.mInventory[this.getInputSlot() + 1], - BioItemList.getPlasmidCell(null), - true) - && this.mInventory[this.getInputSlot() + 1].getTagCompound() != null - && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 2]) - && GT_Utility.areStacksEqual( - this.mInventory[this.getInputSlot() + 2], - FluidLoader.BioLabFluidCells[2]) - && this.mFluid != null - && this.mFluid.isFluidEqual(FluidRegistry.getFluidStack("ic2distilledwater", 1000)) - && this.mFluid.amount >= 1000) { + && this.mInventory[this.getInputSlot()].getTagCompound() != null + && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 1]) + && GT_Utility.areStacksEqual( + this.mInventory[this.getInputSlot() + 1], + BioItemList.getPlasmidCell(null), + true) + && this.mInventory[this.getInputSlot() + 1].getTagCompound() != null + && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 2]) + && GT_Utility + .areStacksEqual(this.mInventory[this.getInputSlot() + 2], FluidLoader.BioLabFluidCells[2]) + && this.mFluid != null + && this.mFluid.isFluidEqual(FluidRegistry.getFluidStack("ic2distilledwater", 1000)) + && this.mFluid.amount >= 1000) { BioData cultureDNABioData = BioData - .getBioDataFromNBTTag(this.mInventory[this.getInputSlot() + 1].getTagCompound()); + .getBioDataFromNBTTag(this.mInventory[this.getInputSlot() + 1].getTagCompound()); BioCulture bioCulture = BioCulture - .getBioCultureFromNBTTag(this.mInventory[this.getInputSlot()].getTagCompound()); + .getBioCultureFromNBTTag(this.mInventory[this.getInputSlot()].getTagCompound()); if (cultureDNABioData == null || bioCulture == null) return super.checkRecipe(skipOC); if (this.mTier < 3 + rTier + cultureDNABioData.getTier()) return GT_MetaTileEntity_BasicMachine.FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; @@ -347,8 +345,8 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine { } this.mOutputItems[1] = ItemList.Cell_Empty.get(1L); this.calculateOverclockedNess( - BW_Util.getMachineVoltageFromTier(3 + rTier + cultureDNABioData.getTier()), - 500); + BW_Util.getMachineVoltageFromTier(3 + rTier + cultureDNABioData.getTier()), + 500); return GT_MetaTileEntity_BasicMachine.FOUND_AND_SUCCESSFULLY_USED_RECIPE; } } @@ -357,27 +355,26 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine { ItemStack Outp = ItemList.Tool_DataOrb.get(1L); Behaviour_DataOrb.setDataTitle(Outp, "DNA Sample"); - if (GT_Utility.isStackValid(this.mInventory[this.getInputSlot()]) && GT_Utility + if (GT_Utility.isStackValid(this.mInventory[this.getInputSlot()]) + && GT_Utility .areStacksEqual(this.mInventory[this.getInputSlot()], BioItemList.getPetriDish(null)) - && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 1]) - && GT_Utility - .areStacksEqual(this.mInventory[this.getInputSlot() + 1], BioItemList.getOther(4)) - && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 2]) - && GT_Utility.areStacksEqual( - this.mInventory[this.getInputSlot() + 2], - ItemList.Circuit_Chip_Stemcell.get(2L)) - && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 3]) - && GT_Utility.areStacksEqual( - this.mInventory[this.getInputSlot() + 3], - ItemList.Tool_DataOrb.get(1L), - true) - && "DNA Sample" - .equals(Behaviour_DataOrb.getDataTitle(this.mInventory[this.getInputSlot() + 3])) - && this.mFluid.isFluidEqual(dnaFluid) - && this.mFluid.amount >= 8000) { + && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 1]) + && GT_Utility.areStacksEqual(this.mInventory[this.getInputSlot() + 1], BioItemList.getOther(4)) + && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 2]) + && GT_Utility.areStacksEqual( + this.mInventory[this.getInputSlot() + 2], + ItemList.Circuit_Chip_Stemcell.get(2L)) + && GT_Utility.isStackValid(this.mInventory[this.getInputSlot() + 3]) + && GT_Utility.areStacksEqual( + this.mInventory[this.getInputSlot() + 3], + ItemList.Tool_DataOrb.get(1L), + true) + && "DNA Sample".equals(Behaviour_DataOrb.getDataTitle(this.mInventory[this.getInputSlot() + 3])) + && this.mFluid.isFluidEqual(dnaFluid) + && this.mFluid.amount >= 8000) { BioData cultureDNABioData = BioData.getBioDataFromName( - Behaviour_DataOrb.getDataName(this.mInventory[this.getInputSlot() + 3])); + Behaviour_DataOrb.getDataName(this.mInventory[this.getInputSlot() + 3])); if (cultureDNABioData == null) return super.checkRecipe(skipOC); if (this.mTier < 3 + rTier + cultureDNABioData.getTier()) return GT_MetaTileEntity_BasicMachine.FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; @@ -393,8 +390,8 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine { this.mOutputItems[0] = BioItemList.getPetriDish(out); } this.calculateOverclockedNess( - BW_Util.getMachineVoltageFromTier(3 + rTier + cultureDNABioData.getTier()), - 500); + BW_Util.getMachineVoltageFromTier(3 + rTier + cultureDNABioData.getTier()), + 500); return GT_MetaTileEntity_BasicMachine.FOUND_AND_SUCCESSFULLY_USED_RECIPE; } } @@ -410,6 +407,6 @@ public class GT_MetaTileEntity_BioLab extends GT_MetaTileEntity_BasicMachine { @Override public String[] getDescription() { return new String[] { StatCollector.translateToLocal("tooltip.tile.biolab.0.name"), - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }; + BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_CompressedFluidHatch.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_CompressedFluidHatch.java index b8331c93f9..e0903ce93c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_CompressedFluidHatch.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_CompressedFluidHatch.java @@ -32,7 +32,7 @@ public class GT_MetaTileEntity_CompressedFluidHatch extends GT_MetaTileEntity_Ha } public GT_MetaTileEntity_CompressedFluidHatch(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -49,10 +49,10 @@ public class GT_MetaTileEntity_CompressedFluidHatch extends GT_MetaTileEntity_Ha @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_CompressedFluidHatch( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java index 0597999155..76a9c1646e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java @@ -49,8 +49,11 @@ public class GT_MetaTileEntity_Diode extends GT_MetaTileEntity_BasicHull { @Override public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { super.onFirstTick(aBaseMetaTileEntity); - if (this.maxAmps == 0 && !this.getBaseMetaTileEntity().getWorld().isRemote) { - this.maxAmps = this.getAmpsfromMeta(this.getBaseMetaTileEntity().getMetaTileID()); + if (this.maxAmps == 0 && !this.getBaseMetaTileEntity() + .getWorld().isRemote) { + this.maxAmps = this.getAmpsfromMeta( + this.getBaseMetaTileEntity() + .getMetaTileID()); this.aAmps = this.maxAmps; } } @@ -59,7 +62,8 @@ public class GT_MetaTileEntity_Diode extends GT_MetaTileEntity_BasicHull { public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); - if (this.getBaseMetaTileEntity().getWorld().isRemote) return; + if (this.getBaseMetaTileEntity() + .getWorld().isRemote) return; if (!aPlayer.isSneaking()) { --this.aAmps; if (this.aAmps < 0) this.aAmps = this.maxAmps; @@ -101,20 +105,15 @@ public class GT_MetaTileEntity_Diode extends GT_MetaTileEntity_BasicHull { private long getAmpsfromMeta(int meta) { if (meta > ConfigHandler.IDOffset + GT_Values.VN.length - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 2) - return 2L; + && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 2) return 2L; if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 2 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 3) - return 4L; + && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 3) return 4L; else if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 3 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 4) - return 8L; + && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 4) return 8L; else if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 4 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 5) - return 12L; + && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 5) return 12L; else if (meta > ConfigHandler.IDOffset + GT_Values.VN.length * 5 - && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 6) - return 16L; + && meta <= ConfigHandler.IDOffset + GT_Values.VN.length * 6) return 16L; else return 0L; } @@ -122,16 +121,16 @@ public class GT_MetaTileEntity_Diode extends GT_MetaTileEntity_BasicHull { @SuppressWarnings("deprecation") public String[] getDescription() { return ArrayUtils.addAll( - this.mDescriptionArray, - StatCollector.translateToLocal("tooltip.tile.tiereddsc.0.name") + " " - + ChatColorHelper.YELLOW - + GT_Utility.formatNumbers(GT_Values.V[this.mTier]), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.1.name") + " " - + ChatColorHelper.YELLOW - + GT_Utility.formatNumbers(this.maxAmperesIn()), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.2.name") + " " - + ChatColorHelper.YELLOW - + GT_Utility.formatNumbers(this.maxAmperesOut()), - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); + this.mDescriptionArray, + StatCollector.translateToLocal("tooltip.tile.tiereddsc.0.name") + " " + + ChatColorHelper.YELLOW + + GT_Utility.formatNumbers(GT_Values.V[this.mTier]), + StatCollector.translateToLocal("tooltip.tile.tiereddsc.1.name") + " " + + ChatColorHelper.YELLOW + + GT_Utility.formatNumbers(this.maxAmperesIn()), + StatCollector.translateToLocal("tooltip.tile.tiereddsc.2.name") + " " + + ChatColorHelper.YELLOW + + GT_Utility.formatNumbers(this.maxAmperesOut()), + BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_EnergyDistributor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_EnergyDistributor.java index 167a3a4758..4431015ca8 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_EnergyDistributor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_EnergyDistributor.java @@ -36,7 +36,7 @@ public class GT_MetaTileEntity_EnergyDistributor extends GT_MetaTileEntity_Trans } public GT_MetaTileEntity_EnergyDistributor(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -73,15 +73,15 @@ public class GT_MetaTileEntity_EnergyDistributor extends GT_MetaTileEntity_Trans @Override public String[] getDescription() { return new String[] { StatCollector.translateToLocal("tooltip.tile.energydistributor.0.name"), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.0.name") + " " - + ChatColorHelper.YELLOW - + GT_Utility.formatNumbers(GT_Values.V[this.mTier]), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.1.name") + " " - + ChatColorHelper.YELLOW - + GT_Utility.formatNumbers(this.maxAmperesIn()), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.2.name") + " " - + ChatColorHelper.YELLOW - + GT_Utility.formatNumbers(this.maxAmperesOut()), - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }; + StatCollector.translateToLocal("tooltip.tile.tiereddsc.0.name") + " " + + ChatColorHelper.YELLOW + + GT_Utility.formatNumbers(GT_Values.V[this.mTier]), + StatCollector.translateToLocal("tooltip.tile.tiereddsc.1.name") + " " + + ChatColorHelper.YELLOW + + GT_Utility.formatNumbers(this.maxAmperesIn()), + StatCollector.translateToLocal("tooltip.tile.tiereddsc.2.name") + " " + + ChatColorHelper.YELLOW + + GT_Utility.formatNumbers(this.maxAmperesOut()), + BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_GiantOutputHatch.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_GiantOutputHatch.java index c004b0db4e..8d5a756cb5 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_GiantOutputHatch.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_GiantOutputHatch.java @@ -26,7 +26,7 @@ public class GT_MetaTileEntity_GiantOutputHatch extends GT_MetaTileEntity_Hatch_ } public GT_MetaTileEntity_GiantOutputHatch(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_HumongousInputHatch.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_HumongousInputHatch.java index 15bee4d1c8..e9db8ac2d5 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_HumongousInputHatch.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_HumongousInputHatch.java @@ -26,7 +26,7 @@ public class GT_MetaTileEntity_HumongousInputHatch extends GT_MetaTileEntity_Hat } public GT_MetaTileEntity_HumongousInputHatch(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -38,9 +38,9 @@ public class GT_MetaTileEntity_HumongousInputHatch extends GT_MetaTileEntity_Hat @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_HumongousInputHatch( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_RadioHatch.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_RadioHatch.java index 6eb6bf9e85..6a66b5209f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_RadioHatch.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_RadioHatch.java @@ -68,7 +68,7 @@ import gregtech.api.util.GT_Utility; import gregtech.common.items.GT_MetaGenerated_Tool_01; public class GT_MetaTileEntity_RadioHatch extends GT_MetaTileEntity_Hatch - implements RecipeMapWorkable, IAddGregtechLogo { + implements RecipeMapWorkable, IAddGregtechLogo { private final int cap; public int sievert; @@ -84,19 +84,19 @@ public class GT_MetaTileEntity_RadioHatch extends GT_MetaTileEntity_Hatch public GT_MetaTileEntity_RadioHatch(int aID, String aName, String aNameRegional, int aTier) { super( - aID, - aName, - aNameRegional, - aTier, - 1, - new String[] { StatCollector.translateToLocal("tooltip.tile.radhatch.0.name"), - StatCollector.translateToLocal("tooltip.tile.tiereddsc.3.name") + " " - + (aTier - 2) - + " " - + (aTier - 2 >= 2 ? StatCollector.translateToLocal("tooltip.bw.kg.1.name") - : StatCollector.translateToLocal("tooltip.bw.kg.0.name")), - StatCollector.translateToLocal("tooltip.tile.radhatch.1.name"), - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }); + aID, + aName, + aNameRegional, + aTier, + 1, + new String[] { StatCollector.translateToLocal("tooltip.tile.radhatch.0.name"), + StatCollector.translateToLocal("tooltip.tile.tiereddsc.3.name") + " " + + (aTier - 2) + + " " + + (aTier - 2 >= 2 ? StatCollector.translateToLocal("tooltip.bw.kg.1.name") + : StatCollector.translateToLocal("tooltip.bw.kg.0.name")), + StatCollector.translateToLocal("tooltip.tile.radhatch.1.name"), + BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }); this.cap = aTier - 2; } @@ -174,7 +174,7 @@ public class GT_MetaTileEntity_RadioHatch extends GT_MetaTileEntity_Hatch } if (myMetaTileEntity.mTickTimer > myMetaTileEntity.mLastSoundTick + ticksBetweenSounds - && this.sievert > 0) { + && this.sievert > 0) { this.sendLoopStart((byte) 1); myMetaTileEntity.mLastSoundTick = myMetaTileEntity.mTickTimer; } @@ -213,11 +213,11 @@ public class GT_MetaTileEntity_RadioHatch extends GT_MetaTileEntity_Hatch if (this.lastRecipe == null || this.lastFail) { this.lastRecipe = BartWorksRecipeMaps.radioHatchRecipes.findRecipe( - this.getBaseMetaTileEntity(), - false, - Integer.MAX_VALUE - 7, - null, - this.mInventory[0]); + this.getBaseMetaTileEntity(), + false, + Integer.MAX_VALUE - 7, + null, + this.mInventory[0]); if (this.lastRecipe == null) { this.lastFail = true; this.lastUsedItem = this.mInventory[0] == null ? null : this.mInventory[0].copy(); @@ -249,27 +249,27 @@ public class GT_MetaTileEntity_RadioHatch extends GT_MetaTileEntity_Hatch @Override public String[] getInfoData() { if (this.sievert != 0) return new String[] { - StatCollector.translateToLocal("tooltip.tile.radhatch.2.name") + " " - + StatCollector.translateToLocal(this.material), - StatCollector.translateToLocal("tooltip.tile.radhatch.3.name") + " " + this.sievert, - StatCollector.translateToLocal("tooltip.tile.radhatch.4.name") + " " + this.mass, - StatCollector.translateToLocal("tooltip.tile.radhatch.5.name") + " " - + (this.decayTime - this.timer % (this.decayTime * 60)) - + StatCollector.translateToLocal("tooltip.tile.radhatch.6.name") - + "/" - + (this.decayTime - this.timer % this.decayTime) / 20 - + StatCollector.translateToLocal("tooltip.tile.radhatch.7.name") - + "/" - + (this.decayTime - this.timer % this.decayTime) / 20 / 60 - + StatCollector.translateToLocal("tooltip.tile.radhatch.8.name") - + "/" - + (this.decayTime - this.timer % this.decayTime) / 20 / 60 / 60 - + StatCollector.translateToLocal("tooltip.tile.radhatch.9.name") }; + StatCollector.translateToLocal("tooltip.tile.radhatch.2.name") + " " + + StatCollector.translateToLocal(this.material), + StatCollector.translateToLocal("tooltip.tile.radhatch.3.name") + " " + this.sievert, + StatCollector.translateToLocal("tooltip.tile.radhatch.4.name") + " " + this.mass, + StatCollector.translateToLocal("tooltip.tile.radhatch.5.name") + " " + + (this.decayTime - this.timer % (this.decayTime * 60)) + + StatCollector.translateToLocal("tooltip.tile.radhatch.6.name") + + "/" + + (this.decayTime - this.timer % this.decayTime) / 20 + + StatCollector.translateToLocal("tooltip.tile.radhatch.7.name") + + "/" + + (this.decayTime - this.timer % this.decayTime) / 20 / 60 + + StatCollector.translateToLocal("tooltip.tile.radhatch.8.name") + + "/" + + (this.decayTime - this.timer % this.decayTime) / 20 / 60 / 60 + + StatCollector.translateToLocal("tooltip.tile.radhatch.9.name") }; return new String[] { - StatCollector.translateToLocal("tooltip.tile.radhatch.2.name") + " " - + StatCollector.translateToLocal("tooltip.bw.empty.name"), - StatCollector.translateToLocal("tooltip.tile.radhatch.3.name") + " " + "0", - StatCollector.translateToLocal("tooltip.tile.radhatch.4.name") + " " + "0" }; + StatCollector.translateToLocal("tooltip.tile.radhatch.2.name") + " " + + StatCollector.translateToLocal("tooltip.bw.empty.name"), + StatCollector.translateToLocal("tooltip.tile.radhatch.3.name") + " " + "0", + StatCollector.translateToLocal("tooltip.tile.radhatch.4.name") + " " + "0" }; } @Override @@ -294,15 +294,15 @@ public class GT_MetaTileEntity_RadioHatch extends GT_MetaTileEntity_Hatch @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { + ItemStack aStack) { return false; } @Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return side == this.getBaseMetaTileEntity().getFrontFacing() - && BartWorksRecipeMaps.radioHatchRecipes.containsInput(aStack); + ItemStack aStack) { + return side == this.getBaseMetaTileEntity() + .getFrontFacing() && BartWorksRecipeMaps.radioHatchRecipes.containsInput(aStack); } @Override @@ -350,79 +350,93 @@ public class GT_MetaTileEntity_RadioHatch extends GT_MetaTileEntity_Hatch public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { buildContext.addSyncedWindow(RADIATION_SHUTTER_WINDOW_ID, this::createShutterWindow); - this.getBaseMetaTileEntity().add1by1Slot(builder); + this.getBaseMetaTileEntity() + .add1by1Slot(builder); builder.widget( - new DrawableWidget().setBackground(BW_UITextures.PICTURE_SIEVERT_CONTAINER).setPos(61, 9) - .setSize(56, 24)) - .widget( - new ProgressBar().setProgress(() -> this.getSievert() / 148f).setDirection(Direction.RIGHT) - .setTexture(BW_UITextures.PROGRESSBAR_SIEVERT, 24).setPos(65, 13).setSize(48, 16)) - .widget( - new DrawableWidget().setBackground(BW_UITextures.PICTURE_DECAY_TIME_INSIDE).setPos(124, 18) - .setSize(16, 48)) - .widget(new DrawableWidget() { - - @Override - public void draw(float partialTicks) { - if (GT_MetaTileEntity_RadioHatch.this.decayTime > 0) { - int height = MathUtils.ceilInt( - 48 * ((GT_MetaTileEntity_RadioHatch.this.decayTime - - GT_MetaTileEntity_RadioHatch.this.timer - % GT_MetaTileEntity_RadioHatch.this.decayTime) - / (float) GT_MetaTileEntity_RadioHatch.this.decayTime)); - new Rectangle() - .setColor( - Color.argb( - GT_MetaTileEntity_RadioHatch.this.colorForGUI[0], - GT_MetaTileEntity_RadioHatch.this.colorForGUI[1], - GT_MetaTileEntity_RadioHatch.this.colorForGUI[2], - 255)) - .draw(new Pos2d(0, 48 - height), new Size(16, height), partialTicks); - } - } - }.dynamicTooltip( - () -> Collections.singletonList( - StatCollector.translateToLocalFormatted( - "tooltip.tile.radhatch.10.name", - this.timer <= 1 ? 0 : (this.decayTime - this.timer) / 20, - this.timer <= 1 ? 0 : this.decayTime / 20))) - .setPos(124, 18).setSize(16, 48) - .attachSyncer( - new FakeSyncWidget.LongSyncer(() -> this.decayTime, val -> this.decayTime = val), - builder, - (widget, val) -> widget.notifyTooltipChange()) - .attachSyncer( - new FakeSyncWidget.LongSyncer(() -> this.timer, val -> this.timer = val), - builder, - (widget, val) -> widget.notifyTooltipChange())) - .widget(new FakeSyncWidget.ShortSyncer(() -> this.colorForGUI[0], val -> this.colorForGUI[0] = val)) - .widget(new FakeSyncWidget.ShortSyncer(() -> this.colorForGUI[1], val -> this.colorForGUI[1] = val)) - .widget(new FakeSyncWidget.ShortSyncer(() -> this.colorForGUI[2], val -> this.colorForGUI[2] = val)) - .widget( - new DrawableWidget().setBackground(BW_UITextures.PICTURE_DECAY_TIME_CONTAINER).setPos(120, 14) - .setSize(24, 56)) - .widget( - new TextWidget().setStringSupplier( - () -> StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.1", this.mass)) - .setTextAlignment(Alignment.Center).setPos(65, 62)) - .widget(new FakeSyncWidget.ByteSyncer(() -> this.mass, val -> this.mass = val)) - .widget( - new TextWidget().setStringSupplier( - () -> StatCollector - .translateToLocalFormatted("BW.NEI.display.radhatch.0", this.getSievert())) - .setTextAlignment(Alignment.Center).setPos(60, 72)) - .widget(new FakeSyncWidget.IntegerSyncer(() -> this.sievert, val -> this.sievert = val)) - .widget(new ButtonWidget().setOnClick((clickData, widget) -> { - if (!widget.isClient()) { - widget.getContext().openSyncedWindow(RADIATION_SHUTTER_WINDOW_ID); + new DrawableWidget().setBackground(BW_UITextures.PICTURE_SIEVERT_CONTAINER) + .setPos(61, 9) + .setSize(56, 24)) + .widget( + new ProgressBar().setProgress(() -> this.getSievert() / 148f) + .setDirection(Direction.RIGHT) + .setTexture(BW_UITextures.PROGRESSBAR_SIEVERT, 24) + .setPos(65, 13) + .setSize(48, 16)) + .widget( + new DrawableWidget().setBackground(BW_UITextures.PICTURE_DECAY_TIME_INSIDE) + .setPos(124, 18) + .setSize(16, 48)) + .widget(new DrawableWidget() { + + @Override + public void draw(float partialTicks) { + if (GT_MetaTileEntity_RadioHatch.this.decayTime > 0) { + int height = MathUtils.ceilInt( + 48 * ((GT_MetaTileEntity_RadioHatch.this.decayTime + - GT_MetaTileEntity_RadioHatch.this.timer % GT_MetaTileEntity_RadioHatch.this.decayTime) + / (float) GT_MetaTileEntity_RadioHatch.this.decayTime)); + new Rectangle() + .setColor( + Color.argb( + GT_MetaTileEntity_RadioHatch.this.colorForGUI[0], + GT_MetaTileEntity_RadioHatch.this.colorForGUI[1], + GT_MetaTileEntity_RadioHatch.this.colorForGUI[2], + 255)) + .draw(new Pos2d(0, 48 - height), new Size(16, height), partialTicks); } - }).addTooltip("Radiation Shutter").setBackground(GT_UITextures.BUTTON_STANDARD).setPos(153, 5) - .setSize(18, 18)) - .widget( - new ItemDrawable( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, null, null, null)) - .asWidget().setPos(154, 6)); + } + }.dynamicTooltip( + () -> Collections.singletonList( + StatCollector.translateToLocalFormatted( + "tooltip.tile.radhatch.10.name", + this.timer <= 1 ? 0 : (this.decayTime - this.timer) / 20, + this.timer <= 1 ? 0 : this.decayTime / 20))) + .setPos(124, 18) + .setSize(16, 48) + .attachSyncer( + new FakeSyncWidget.LongSyncer(() -> this.decayTime, val -> this.decayTime = val), + builder, + (widget, val) -> widget.notifyTooltipChange()) + .attachSyncer( + new FakeSyncWidget.LongSyncer(() -> this.timer, val -> this.timer = val), + builder, + (widget, val) -> widget.notifyTooltipChange())) + .widget(new FakeSyncWidget.ShortSyncer(() -> this.colorForGUI[0], val -> this.colorForGUI[0] = val)) + .widget(new FakeSyncWidget.ShortSyncer(() -> this.colorForGUI[1], val -> this.colorForGUI[1] = val)) + .widget(new FakeSyncWidget.ShortSyncer(() -> this.colorForGUI[2], val -> this.colorForGUI[2] = val)) + .widget( + new DrawableWidget().setBackground(BW_UITextures.PICTURE_DECAY_TIME_CONTAINER) + .setPos(120, 14) + .setSize(24, 56)) + .widget( + new TextWidget() + .setStringSupplier( + () -> StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.1", this.mass)) + .setTextAlignment(Alignment.Center) + .setPos(65, 62)) + .widget(new FakeSyncWidget.ByteSyncer(() -> this.mass, val -> this.mass = val)) + .widget( + new TextWidget() + .setStringSupplier( + () -> StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.0", this.getSievert())) + .setTextAlignment(Alignment.Center) + .setPos(60, 72)) + .widget(new FakeSyncWidget.IntegerSyncer(() -> this.sievert, val -> this.sievert = val)) + .widget(new ButtonWidget().setOnClick((clickData, widget) -> { + if (!widget.isClient()) { + widget.getContext() + .openSyncedWindow(RADIATION_SHUTTER_WINDOW_ID); + } + }) + .addTooltip("Radiation Shutter") + .setBackground(GT_UITextures.BUTTON_STANDARD) + .setPos(153, 5) + .setSize(18, 18)) + .widget( + new ItemDrawable( + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, null, null, null)).asWidget() + .setPos(154, 6)); } private ModularWindow createShutterWindow(EntityPlayer player) { @@ -431,25 +445,35 @@ public class GT_MetaTileEntity_RadioHatch extends GT_MetaTileEntity_Hatch builder.setGuiTint(this.getGUIColorization()); builder.widget( - new TextWidget("Radiation Shutter Control").setDefaultColor(this.COLOR_TITLE.get()).setPos(10, 9)) - .widget( - new DrawableWidget().setDrawable(BW_UITextures.PICTURE_RADIATION_SHUTTER_FRAME).setPos(14, 27) - .setSize(55, 54)) - .widget( - new DrawableWidget().setDrawable( - () -> this.coverage < 100 ? BW_UITextures.PICTURE_RADIATION_SHUTTER_INSIDE : null) - .setPos(16, 29).setSize(51, 50).attachSyncer( - new FakeSyncWidget.ByteSyncer(this::getCoverage, this::setCoverage), - builder, - (widget, val) -> widget.setPos(16, 29 + this.coverage / 2) - .setSize(51, 50 - this.coverage / 2))) - .widget( - new NumericWidget().setSetter(val -> this.coverage = (byte) val).setGetter(() -> this.coverage) - .setBounds(0, 100).setScrollValues(1, 5, 50).setTextColor(Color.WHITE.dark(1)) - .setTextAlignment(Alignment.CenterLeft) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2)) - .setPos(86, 27).setSize(30, 12)) - .widget(ButtonWidget.closeWindowButton(true).setPos(176 - 15, 3)); + new TextWidget("Radiation Shutter Control").setDefaultColor(this.COLOR_TITLE.get()) + .setPos(10, 9)) + .widget( + new DrawableWidget().setDrawable(BW_UITextures.PICTURE_RADIATION_SHUTTER_FRAME) + .setPos(14, 27) + .setSize(55, 54)) + .widget( + new DrawableWidget() + .setDrawable(() -> this.coverage < 100 ? BW_UITextures.PICTURE_RADIATION_SHUTTER_INSIDE : null) + .setPos(16, 29) + .setSize(51, 50) + .attachSyncer( + new FakeSyncWidget.ByteSyncer(this::getCoverage, this::setCoverage), + builder, + (widget, val) -> widget.setPos(16, 29 + this.coverage / 2) + .setSize(51, 50 - this.coverage / 2))) + .widget( + new NumericWidget().setSetter(val -> this.coverage = (byte) val) + .setGetter(() -> this.coverage) + .setBounds(0, 100) + .setScrollValues(1, 5, 50) + .setTextColor(Color.WHITE.dark(1)) + .setTextAlignment(Alignment.CenterLeft) + .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2)) + .setPos(86, 27) + .setSize(30, 12)) + .widget( + ButtonWidget.closeWindowButton(true) + .setPos(176 - 15, 3)); return builder.build(); } @@ -457,13 +481,15 @@ public class GT_MetaTileEntity_RadioHatch extends GT_MetaTileEntity_Hatch @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(BW_UITextures.PICTURE_BW_LOGO_47X21).setSize(47, 21).setPos(10, 53)); + new DrawableWidget().setDrawable(BW_UITextures.PICTURE_BW_LOGO_47X21) + .setSize(47, 21) + .setPos(10, 53)); } @Override public GUITextureSet getGUITextureSet() { return new GUITextureSet().setMainBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT) - .setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT); + .setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Transistor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Transistor.java index 51a73c1533..46f20e441d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Transistor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Transistor.java @@ -31,12 +31,12 @@ public class GT_MetaTileEntity_Transistor extends GT_MetaTileEntity_TieredMachin boolean powered; public GT_MetaTileEntity_Transistor(int aID, String aName, String aNameRegional, int aTier, String aDescription, - ITexture... aTextures) { + ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, 0, aDescription, aTextures); } public GT_MetaTileEntity_Transistor(int aID, String aName, String aNameRegional, int aTier, String[] aDescription, - ITexture... aTextures) { + ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, 0, aDescription, aTextures); } @@ -54,29 +54,29 @@ public class GT_MetaTileEntity_Transistor extends GT_MetaTileEntity_TieredMachin for (byte i = -1; i < 16; ++i) { rTextures[0][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; rTextures[1][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; rTextures[2][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier] }; rTextures[3][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; rTextures[4][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; rTextures[5][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; rTextures[6][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier] }; rTextures[7][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier] }; rTextures[8][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_IN[this.mTier] }; rTextures[9][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; rTextures[10][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; rTextures[11][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; } return rTextures; @@ -101,7 +101,7 @@ public class GT_MetaTileEntity_Transistor extends GT_MetaTileEntity_TieredMachin return; } if (!tileAtSide.outputsEnergyTo(ForgeDirection.WEST) || !tileAtSide.isUniversalEnergyStored(4L) - || !tileAtSide.decreaseStoredEnergyUnits(4, false)) { + || !tileAtSide.decreaseStoredEnergyUnits(4, false)) { this.powered = false; return; } @@ -139,19 +139,19 @@ public class GT_MetaTileEntity_Transistor extends GT_MetaTileEntity_TieredMachin @Override public boolean allowPullStack(IGregTechTileEntity iGregTechTileEntity, int i, ForgeDirection side, - ItemStack itemStack) { + ItemStack itemStack) { return false; } @Override public boolean allowPutStack(IGregTechTileEntity iGregTechTileEntity, int i, ForgeDirection side, - ItemStack itemStack) { + ItemStack itemStack) { return false; } @Override public ITexture[] getTexture(IGregTechTileEntity iGregTechTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean b3, boolean b4) { + int colorIndex, boolean b3, boolean b4) { return new ITexture[0]; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioLabHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioLabHandler.java index c5fc4b1465..40233912e6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioLabHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioLabHandler.java @@ -31,10 +31,10 @@ public class BW_NEI_BioLabHandler extends GT_NEI_DefaultHandler { super(recipeCategory); if (!NEI_BW_Config.sIsAdded) { FMLInterModComms.sendRuntimeMessage( - GT_Values.GT, - "NEIPlugins", - "register-crafting-handler", - "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); + GT_Values.GT, + "NEIPlugins", + "register-crafting-handler", + "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); GuiCraftingRecipe.craftinghandlers.add(this); GuiUsageRecipe.usagehandlers.add(this); } @@ -48,8 +48,8 @@ public class BW_NEI_BioLabHandler extends GT_NEI_DefaultHandler { @Override public void loadCraftingRecipes(ItemStack aResult) { if (aResult != null && aResult.getItem() instanceof LabParts - && aResult.getItemDamage() < 3 - && aResult.getTagCompound() != null) { + && aResult.getItemDamage() < 3 + && aResult.getTagCompound() != null) { for (CachedDefaultRecipe recipe : this.getCache()) if (NEI_BW_Config.checkRecipe(aResult, recipe.mOutputs)) this.arecipes.add(recipe); } else { @@ -60,8 +60,8 @@ public class BW_NEI_BioLabHandler extends GT_NEI_DefaultHandler { @Override public void loadUsageRecipes(ItemStack aResult) { if (aResult != null && aResult.getItem() instanceof LabParts - && aResult.getItemDamage() < 3 - && aResult.getTagCompound() != null) { + && aResult.getItemDamage() < 3 + && aResult.getTagCompound() != null) { for (CachedDefaultRecipe recipe : this.getCache()) if (NEI_BW_Config.checkRecipe(aResult, recipe.mInputs)) this.arecipes.add(recipe); } else { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioVatHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioVatHandler.java index 38f2a9c800..cddb16c6c8 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioVatHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioVatHandler.java @@ -34,10 +34,10 @@ public class BW_NEI_BioVatHandler extends GT_NEI_DefaultHandler { super(recipeCategory); if (!NEI_BW_Config.sIsAdded) { FMLInterModComms.sendRuntimeMessage( - GT_Values.GT, - "NEIPlugins", - "register-crafting-handler", - "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); + GT_Values.GT, + "NEIPlugins", + "register-crafting-handler", + "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); GuiCraftingRecipe.craftinghandlers.add(this); GuiUsageRecipe.usagehandlers.add(this); } @@ -54,8 +54,7 @@ public class BW_NEI_BioVatHandler extends GT_NEI_DefaultHandler { // see constructor of CachedDefaultRecipe on why relx==120 and rely==52 means special slot for (PositionedStack stack : recipe.mInputs) { if (stack.relx == 120 && stack.rely == 52 - && NEI_BW_Config.checkRecipe(aResult, Collections.singletonList(stack))) - this.arecipes.add(recipe); + && NEI_BW_Config.checkRecipe(aResult, Collections.singletonList(stack))) this.arecipes.add(recipe); } } } @@ -63,8 +62,8 @@ public class BW_NEI_BioVatHandler extends GT_NEI_DefaultHandler { @Override public void loadUsageRecipes(ItemStack aResult) { if (aResult != null && aResult.getItem() instanceof LabParts - && aResult.getItemDamage() < 3 - && aResult.getTagCompound() != null) { + && aResult.getItemDamage() < 3 + && aResult.getTagCompound() != null) { this.loadLabPartRecipes(aResult); } else { super.loadUsageRecipes(aResult); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_OreHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_OreHandler.java index a717e3915a..2b34250512 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_OreHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_OreHandler.java @@ -43,10 +43,10 @@ public class BW_NEI_OreHandler extends TemplateRecipeHandler { public BW_NEI_OreHandler() { if (!NEI_BW_Config.sIsAdded) { FMLInterModComms.sendRuntimeMessage( - MainMod.MOD_ID, - "NEIPlugins", - "register-crafting-handler", - MainMod.MOD_ID + "@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); + MainMod.MOD_ID, + "NEIPlugins", + "register-crafting-handler", + MainMod.MOD_ID + "@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); GuiCraftingRecipe.craftinghandlers.add(this); } } @@ -59,7 +59,7 @@ public class BW_NEI_OreHandler extends TemplateRecipeHandler { @Override public void loadTransferRects() { this.transferRects.add( - new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(0, 40, 40, 120), "quickanddirtyneihandler")); + new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(0, 40, 40, 120), "quickanddirtyneihandler")); } @Override @@ -71,12 +71,14 @@ public class BW_NEI_OreHandler extends TemplateRecipeHandler { public void loadCraftingRecipes(String outputId, Object... results) { if ("quickanddirtyneihandler".equalsIgnoreCase(outputId)) { HashSet<ItemStack> result = new HashSet<>(); - Werkstoff.werkstoffHashSet.stream().filter(w -> w.hasGenerationFeature(OrePrefixes.ore)) - .forEach(w -> result.add(w.get(OrePrefixes.ore))); + Werkstoff.werkstoffHashSet.stream() + .filter(w -> w.hasGenerationFeature(OrePrefixes.ore)) + .forEach(w -> result.add(w.get(OrePrefixes.ore))); result.forEach(this::loadCraftingRecipes); result.clear(); - Werkstoff.werkstoffHashSet.stream().filter(w -> w.hasGenerationFeature(OrePrefixes.ore)) - .forEach(w -> result.add(w.get(OrePrefixes.oreSmall))); + Werkstoff.werkstoffHashSet.stream() + .filter(w -> w.hasGenerationFeature(OrePrefixes.ore)) + .forEach(w -> result.add(w.get(OrePrefixes.oreSmall))); result.forEach(this::loadCraftingRecipes); result.clear(); HashSet<TemplateRecipeHandler.CachedRecipe> hashSet = new HashSet<>(this.arecipes); @@ -97,40 +99,75 @@ public class BW_NEI_OreHandler extends TemplateRecipeHandler { CachedOreRecipe cachedOreRecipe = (CachedOreRecipe) this.arecipes.get(recipe); if (cachedOreRecipe == null || cachedOreRecipe.getOtherStacks() == null - || cachedOreRecipe.getOtherStacks().size() == 0) + || cachedOreRecipe.getOtherStacks() + .size() == 0) return; if (!cachedOreRecipe.small) { - if (cachedOreRecipe.getOtherStacks().get(0) == null - || cachedOreRecipe.getOtherStacks().get(0).item == null - || cachedOreRecipe.getOtherStacks().get(1) == null - || cachedOreRecipe.getOtherStacks().get(2) == null - || cachedOreRecipe.getOtherStacks().get(3) == null - || cachedOreRecipe.getOtherStacks().get(1).item == null - || cachedOreRecipe.getOtherStacks().get(2).item == null - || cachedOreRecipe.getOtherStacks().get(3).item == null) + if (cachedOreRecipe.getOtherStacks() + .get(0) == null + || cachedOreRecipe.getOtherStacks() + .get(0).item == null + || cachedOreRecipe.getOtherStacks() + .get(1) == null + || cachedOreRecipe.getOtherStacks() + .get(2) == null + || cachedOreRecipe.getOtherStacks() + .get(3) == null + || cachedOreRecipe.getOtherStacks() + .get(1).item == null + || cachedOreRecipe.getOtherStacks() + .get(2).item == null + || cachedOreRecipe.getOtherStacks() + .get(3).item == null) return; - } else if (cachedOreRecipe.getOtherStacks().get(0) == null - || cachedOreRecipe.getOtherStacks().get(0).item == null) + } else if (cachedOreRecipe.getOtherStacks() + .get(0) == null + || cachedOreRecipe.getOtherStacks() + .get(0).item == null) return; if (cachedOreRecipe.worldGen != null) GuiDraw.drawString( - ChatColorHelper.BOLD + "DIM: " + ChatColorHelper.RESET + cachedOreRecipe.worldGen.getDimName(), - 0, - 40, - 0, - false); + ChatColorHelper.BOLD + "DIM: " + ChatColorHelper.RESET + cachedOreRecipe.worldGen.getDimName(), + 0, + 40, + 0, + false); GuiDraw.drawString(ChatColorHelper.BOLD + "Primary:", 0, 50, 0, false); - GuiDraw.drawString(cachedOreRecipe.getOtherStacks().get(0).item.getDisplayName(), 0, 60, 0, false); + GuiDraw.drawString( + cachedOreRecipe.getOtherStacks() + .get(0).item.getDisplayName(), + 0, + 60, + 0, + false); if (!cachedOreRecipe.small) { GuiDraw.drawString(ChatColorHelper.BOLD + "Secondary:", 0, 70, 0, false); - GuiDraw.drawString(cachedOreRecipe.getOtherStacks().get(1).item.getDisplayName(), 0, 80, 0, false); + GuiDraw.drawString( + cachedOreRecipe.getOtherStacks() + .get(1).item.getDisplayName(), + 0, + 80, + 0, + false); GuiDraw.drawString(ChatColorHelper.BOLD + "InBetween:", 0, 90, 0, false); - GuiDraw.drawString(cachedOreRecipe.getOtherStacks().get(2).item.getDisplayName(), 0, 100, 0, false); + GuiDraw.drawString( + cachedOreRecipe.getOtherStacks() + .get(2).item.getDisplayName(), + 0, + 100, + 0, + false); GuiDraw.drawString(ChatColorHelper.BOLD + "Sporadic:", 0, 110, 0, false); - GuiDraw.drawString(cachedOreRecipe.getOtherStacks().get(3).item.getDisplayName(), 0, 120, 0, false); + GuiDraw.drawString( + cachedOreRecipe.getOtherStacks() + .get(3).item.getDisplayName(), + 0, + 120, + 0, + false); } else if (cachedOreRecipe.worldGen != null) { GuiDraw.drawString(ChatColorHelper.BOLD + "Amount per Chunk:", 0, 70, 0, false); GuiDraw.drawString(cachedOreRecipe.worldGen.mDensity + "", 0, 80, 0, false); @@ -143,12 +180,15 @@ public class BW_NEI_OreHandler extends TemplateRecipeHandler { public void loadCraftingRecipes(ItemStack result) { Block ore = Block.getBlockFromItem(result.getItem()); if (ore instanceof BW_MetaGenerated_Ores) { - BW_OreLayer.NEIMAP.get((short) result.getItemDamage()).stream().filter( - l -> !(ore instanceof BW_MetaGenerated_SmallOres) || !l.getClass().equals(BW_WorldGenRoss128b.class) - && !l.getClass().equals(BW_WorldGenRoss128ba.class)) - .forEach( - l -> this.arecipes - .add(new CachedOreRecipe(l, result, ore instanceof BW_MetaGenerated_SmallOres))); + BW_OreLayer.NEIMAP.get((short) result.getItemDamage()) + .stream() + .filter( + l -> !(ore instanceof BW_MetaGenerated_SmallOres) || !l.getClass() + .equals(BW_WorldGenRoss128b.class) + && !l.getClass() + .equals(BW_WorldGenRoss128ba.class)) + .forEach( + l -> this.arecipes.add(new CachedOreRecipe(l, result, ore instanceof BW_MetaGenerated_SmallOres))); } } @@ -185,7 +225,12 @@ public class BW_NEI_OreHandler extends TemplateRecipeHandler { int x = 0; for (int i = 0; i < (this.small ? 1 : 4); i++) { x += 20; - ret.add(new PositionedStack(this.worldGen.getStacks().get(i), x, 12)); + ret.add( + new PositionedStack( + this.worldGen.getStacks() + .get(i), + x, + 12)); } return ret; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/NEI_BW_Config.java b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/NEI_BW_Config.java index 9b403a743b..a6efebeb83 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/NEI_BW_Config.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/NEI_BW_Config.java @@ -33,7 +33,8 @@ public class NEI_BW_Config implements IConfigureNEI { static boolean checkRecipe(ItemStack labPart, Iterable<? extends PositionedStack> stacks) { for (PositionedStack stack : stacks) { for (ItemStack item : stack.items) { - if (labPart.getTagCompound().equals(item.getTagCompound())) { + if (labPart.getTagCompound() + .equals(item.getTagCompound())) { return true; } } @@ -48,20 +49,30 @@ public class NEI_BW_Config implements IConfigureNEI { API.hideItem(new ItemStack(ItemRegistry.bw_fake_glasses)); API.hideItem(new ItemStack(ItemRegistry.bw_fake_glasses2)); ItemStack[] prefixesToHide = { - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustTiny, WerkstoffLoader.Bismutite).copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustSmall, WerkstoffLoader.Bismutite).copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushed, WerkstoffLoader.Bismutite).copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushedPurified, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushedCentrifuged, WerkstoffLoader.Bismutite) - .copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.nugget, WerkstoffLoader.Bismutite).copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemChipped, WerkstoffLoader.Bismutite).copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemFlawed, WerkstoffLoader.Bismutite).copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemFlawless, WerkstoffLoader.Bismutite).copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemExquisite, WerkstoffLoader.Bismutite).copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustImpure, WerkstoffLoader.Bismutite).copy(), - WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustPure, WerkstoffLoader.Bismutite).copy(), }; + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustTiny, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustSmall, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushed, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushedPurified, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.crushedCentrifuged, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.nugget, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemChipped, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemFlawed, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemFlawless, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.gemExquisite, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustImpure, WerkstoffLoader.Bismutite) + .copy(), + WerkstoffLoader.getCorrespondingItemStack(OrePrefixes.dustPure, WerkstoffLoader.Bismutite) + .copy(), }; for (ItemStack stack : prefixesToHide) { stack.setItemDamage(Short.MAX_VALUE); API.hideItem(stack); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java index 7445946828..3ea2f28cb9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/server/EventHandler/ServerEventHandler.java @@ -38,7 +38,7 @@ public class ServerEventHandler { public void EntityJoinWorldEvent(EntityJoinWorldEvent event) { if (event == null || !(event.entity instanceof EntityPlayerMP) || !SideReference.Side.Server) return; MainMod.BW_Network_instance - .sendToPlayer(new OreDictCachePacket(OreDictHandler.getNonBWCache()), (EntityPlayerMP) event.entity); + .sendToPlayer(new OreDictCachePacket(OreDictHandler.getNonBWCache()), (EntityPlayerMP) event.entity); MainMod.BW_Network_instance.sendToPlayer(new ServerJoinedPackage(null), (EntityPlayerMP) event.entity); } @@ -46,8 +46,7 @@ public class ServerEventHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public void onPlayerTickEventServer(TickEvent.PlayerTickEvent event) { if (event == null || !(event.player instanceof EntityPlayerMP) - || event.player.worldObj.getTotalWorldTime() % 20 != 0) - return; + || event.player.worldObj.getTotalWorldTime() % 20 != 0) return; boolean replace = false; ItemStack toReplace = null; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java index 97924d1447..87ee19833d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_GT_MaterialReference.java @@ -25,7 +25,7 @@ import gregtech.api.enums.Materials; public class BW_GT_MaterialReference { private static final Werkstoff.GenerationFeatures ADD_CASINGS_ONLY = new Werkstoff.GenerationFeatures().disable() - .addCasings(); + .addCasings(); public static Werkstoff Aluminium = new Werkstoff(Materials.Aluminium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 19); public static Werkstoff Americium = new Werkstoff(Materials.Americium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 103); @@ -68,16 +68,16 @@ public class BW_GT_MaterialReference { public static Werkstoff Phosphorus = new Werkstoff(Materials.Phosphorus, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 21); public static Werkstoff Platinum = new Werkstoff(Materials.Platinum, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 85); public static Werkstoff Plutonium241 = new Werkstoff( - Materials.Plutonium241, - ADD_CASINGS_ONLY, - ISOTOPE, - 31_766 + 101); + Materials.Plutonium241, + ADD_CASINGS_ONLY, + ISOTOPE, + 31_766 + 101); public static Werkstoff Potassium = new Werkstoff(Materials.Potassium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 25); public static Werkstoff Praseodymium = new Werkstoff( - Materials.Praseodymium, - ADD_CASINGS_ONLY, - ELEMENT, - 31_766 + 66); + Materials.Praseodymium, + ADD_CASINGS_ONLY, + ELEMENT, + 31_766 + 66); public static Werkstoff Promethium = new Werkstoff(Materials.Promethium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 68); public static Werkstoff Rubidium = new Werkstoff(Materials.Rubidium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 43); public static Werkstoff Samarium = new Werkstoff(Materials.Samarium, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 69); @@ -105,68 +105,68 @@ public class BW_GT_MaterialReference { public static Werkstoff Ardite = new Werkstoff(Materials.Ardite, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 382); public static Werkstoff Naquadah = new Werkstoff(Materials.Naquadah, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 324); public static Werkstoff NaquadahAlloy = new Werkstoff( - Materials.NaquadahAlloy, - ADD_CASINGS_ONLY, - COMPOUND, - 31_766 + 325); + Materials.NaquadahAlloy, + ADD_CASINGS_ONLY, + COMPOUND, + 31_766 + 325); public static Werkstoff NaquadahEnriched = new Werkstoff( - Materials.NaquadahEnriched, - ADD_CASINGS_ONLY, - ISOTOPE, - 31_766 + 326); + Materials.NaquadahEnriched, + ADD_CASINGS_ONLY, + ISOTOPE, + 31_766 + 326); public static Werkstoff Naquadria = new Werkstoff(Materials.Naquadria, ADD_CASINGS_ONLY, ELEMENT, 31_766 + 327); public static Werkstoff WroughtIron = new Werkstoff(Materials.WroughtIron, ADD_CASINGS_ONLY, ISOTOPE, 31_766 + 304); public static Werkstoff AnnealedCopper = new Werkstoff( - Materials.AnnealedCopper, - ADD_CASINGS_ONLY, - ISOTOPE, - 31_766 + 345); + Materials.AnnealedCopper, + ADD_CASINGS_ONLY, + ISOTOPE, + 31_766 + 345); public static Werkstoff Osmiridium = new Werkstoff(Materials.Osmiridium, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 317); public static Werkstoff SterlingSilver = new Werkstoff( - Materials.SterlingSilver, - ADD_CASINGS_ONLY, - MIXTURE, - 31_766 + 350); + Materials.SterlingSilver, + ADD_CASINGS_ONLY, + MIXTURE, + 31_766 + 350); public static Werkstoff RoseGold = new Werkstoff(Materials.RoseGold, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 351); public static Werkstoff BlackBronze = new Werkstoff(Materials.BlackBronze, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 352); public static Werkstoff BismuthBronze = new Werkstoff( - Materials.BismuthBronze, - ADD_CASINGS_ONLY, - MIXTURE, - 31_766 + 353); + Materials.BismuthBronze, + ADD_CASINGS_ONLY, + MIXTURE, + 31_766 + 353); public static Werkstoff BlackSteel = new Werkstoff(Materials.BlackSteel, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 334); public static Werkstoff RedSteel = new Werkstoff(Materials.RedSteel, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 348); public static Werkstoff BlueSteel = new Werkstoff(Materials.BlueSteel, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 349); public static Werkstoff DamascusSteel = new Werkstoff( - Materials.DamascusSteel, - ADD_CASINGS_ONLY, - MIXTURE, - 31_766 + 335); + Materials.DamascusSteel, + ADD_CASINGS_ONLY, + MIXTURE, + 31_766 + 335); public static Werkstoff TungstenSteel = new Werkstoff( - Materials.TungstenSteel, - ADD_CASINGS_ONLY, - MIXTURE, - 31_766 + 316); + Materials.TungstenSteel, + ADD_CASINGS_ONLY, + MIXTURE, + 31_766 + 316); public static Werkstoff Ultimet = new Werkstoff(Materials.Ultimet, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 344); public static Werkstoff TungstenCarbide = new Werkstoff( - Materials.TungstenCarbide, - ADD_CASINGS_ONLY, - MIXTURE, - 31_766 + 370); + Materials.TungstenCarbide, + ADD_CASINGS_ONLY, + MIXTURE, + 31_766 + 370); public static Werkstoff VanadiumSteel = new Werkstoff( - Materials.VanadiumSteel, - ADD_CASINGS_ONLY, - MIXTURE, - 31_766 + 371); + Materials.VanadiumSteel, + ADD_CASINGS_ONLY, + MIXTURE, + 31_766 + 371); public static Werkstoff HSSG = new Werkstoff(Materials.HSSG, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 372); public static Werkstoff HSSE = new Werkstoff(Materials.HSSE, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 373); public static Werkstoff HSSS = new Werkstoff(Materials.HSSS, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 374); public static Werkstoff StainlessSteel = new Werkstoff( - Materials.StainlessSteel, - ADD_CASINGS_ONLY, - MIXTURE, - 31_766 + 306); + Materials.StainlessSteel, + ADD_CASINGS_ONLY, + MIXTURE, + 31_766 + 306); public static Werkstoff Brass = new Werkstoff(Materials.Brass, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 301); public static Werkstoff Bronze = new Werkstoff(Materials.Bronze, ADD_CASINGS_ONLY, MIXTURE, 31_766 + 300); @@ -174,17 +174,19 @@ public class BW_GT_MaterialReference { public static Werkstoff Steel = new Werkstoff(Materials.Steel, ADD_CASINGS_ONLY, COMPOUND, 31_766 + 305); public static Werkstoff Polytetrafluoroethylene = new Werkstoff( - Materials.Polytetrafluoroethylene, - ADD_CASINGS_ONLY, - COMPOUND, - 31_766 + 473); + Materials.Polytetrafluoroethylene, + ADD_CASINGS_ONLY, + COMPOUND, + 31_766 + 473); public static Werkstoff Plastic = new Werkstoff(Materials.Plastic, ADD_CASINGS_ONLY, COMPOUND, 31_766 + 874); public static Werkstoff Epoxid = new Werkstoff(Materials.Epoxid, ADD_CASINGS_ONLY, COMPOUND, 31_766 + 470); public static Werkstoff Magnesia = new Werkstoff( - Materials.Magnesia, - new Werkstoff.GenerationFeatures().disable().addMetalItems().addMolten(), - COMPOUND, - 31_766 + 471); + Materials.Magnesia, + new Werkstoff.GenerationFeatures().disable() + .addMetalItems() + .addMolten(), + COMPOUND, + 31_766 + 471); public static void init() { MainMod.LOGGER.info("Load Elements from GT"); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java index 24402ac369..41f28d033a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlock_Item.java @@ -39,7 +39,7 @@ public class BW_MetaGeneratedBlock_Item extends BW_ItemBlocks { @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float hitX, float hitY, float hitZ) { + float hitX, float hitY, float hitZ) { return false; } @@ -89,7 +89,7 @@ public class BW_MetaGeneratedBlock_Item extends BW_ItemBlocks { @Override public boolean placeBlockAt(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int side, - float hitX, float hitY, float hitZ, int aMeta) { + float hitX, float hitY, float hitZ, int aMeta) { short tDamage = (short) this.getDamage(aStack); if (tDamage > 0) { if (!aWorld.setBlock(aX, aY, aZ, this.field_150939_a, tDamage, 3)) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java index fef152ec40..6fb1650c1f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing.java @@ -32,10 +32,10 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.OrePrefixes; public class BW_MetaGeneratedBlocks_Casing extends BW_MetaGenerated_Blocks - implements com.gtnewhorizon.structurelib.structure.ICustomBlockSetting { + implements com.gtnewhorizon.structurelib.structure.ICustomBlockSetting { public BW_MetaGeneratedBlocks_Casing(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, String blockName, - OrePrefixes prefixes) { + OrePrefixes prefixes) { super(p_i45386_1_, tileEntity, blockName, prefixes); } @@ -92,15 +92,16 @@ public class BW_MetaGeneratedBlocks_Casing extends BW_MetaGenerated_Blocks @SideOnly(Side.CLIENT) public void getSubBlocks(Item aItem, CreativeTabs aTab, List<ItemStack> aList) { Werkstoff.werkstoffHashSet.stream() - .filter( - pMaterial -> Werkstoff.Types.BIOLOGICAL.equals(pMaterial.getType()) - && pMaterial.hasGenerationFeature(OrePrefixes.blockCasing) - || pMaterial.doesOreDictedItemExists(OrePrefixes.plate) - && pMaterial.doesOreDictedItemExists(OrePrefixes.screw) - && pMaterial.doesOreDictedItemExists(OrePrefixes.plateDouble) - && pMaterial.doesOreDictedItemExists(OrePrefixes.gearGt) - && pMaterial.doesOreDictedItemExists(OrePrefixes.gearGtSmall)) - .map(pMaterial -> new ItemStack(aItem, 1, pMaterial.getmID())).forEach(aList::add); + .filter( + pMaterial -> Werkstoff.Types.BIOLOGICAL.equals(pMaterial.getType()) + && pMaterial.hasGenerationFeature(OrePrefixes.blockCasing) + || pMaterial.doesOreDictedItemExists(OrePrefixes.plate) + && pMaterial.doesOreDictedItemExists(OrePrefixes.screw) + && pMaterial.doesOreDictedItemExists(OrePrefixes.plateDouble) + && pMaterial.doesOreDictedItemExists(OrePrefixes.gearGt) + && pMaterial.doesOreDictedItemExists(OrePrefixes.gearGtSmall)) + .map(pMaterial -> new ItemStack(aItem, 1, pMaterial.getmID())) + .forEach(aList::add); } /** @@ -112,7 +113,9 @@ public class BW_MetaGeneratedBlocks_Casing extends BW_MetaGenerated_Blocks Thread.sleep(1); // Fucking Minecraft TE settings. } catch (InterruptedException ignored) {} - Optional.ofNullable(world.getTileEntity(x, y, z)).filter(te -> te instanceof BW_MetaGenerated_Block_TE) - .map(te -> (BW_MetaGenerated_Block_TE) te).ifPresent(te -> te.mMetaData = (short) meta); + Optional.ofNullable(world.getTileEntity(x, y, z)) + .filter(te -> te instanceof BW_MetaGenerated_Block_TE) + .map(te -> (BW_MetaGenerated_Block_TE) te) + .ifPresent(te -> te.mMetaData = (short) meta); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_CasingAdvanced_TE.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_CasingAdvanced_TE.java index 9f1b197b8d..02dd3c8f58 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_CasingAdvanced_TE.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_CasingAdvanced_TE.java @@ -39,13 +39,13 @@ public class BW_MetaGeneratedBlocks_CasingAdvanced_TE extends BW_MetaGenerated_B if (aMaterial != null) { TextureSet set = aMaterial.getTexSet(); ITexture aIconSet = TextureFactory.of( - PrefixTextureLinker.texMapBlocks.get(OrePrefixes.blockCasingAdvanced) - .getOrDefault(set, TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]), - aMaterial.getRGBA()); + PrefixTextureLinker.texMapBlocks.get(OrePrefixes.blockCasingAdvanced) + .getOrDefault(set, TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]), + aMaterial.getRGBA()); return new ITexture[] { TextureFactory.of(Blocks.iron_block), aIconSet }; } } return new ITexture[] { TextureFactory.of(Blocks.iron_block), - TextureFactory.of(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]) }; + TextureFactory.of(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]) }; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing_TE.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing_TE.java index f23fc3a912..af61e1a68a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing_TE.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedBlocks_Casing_TE.java @@ -39,13 +39,13 @@ public class BW_MetaGeneratedBlocks_Casing_TE extends BW_MetaGenerated_Block_TE if (aMaterial != null) { TextureSet set = aMaterial.getTexSet(); ITexture aIconSet = TextureFactory.of( - PrefixTextureLinker.texMapBlocks.get(OrePrefixes.blockCasing) - .getOrDefault(set, TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]), - aMaterial.getRGBA()); + PrefixTextureLinker.texMapBlocks.get(OrePrefixes.blockCasing) + .getOrDefault(set, TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]), + aMaterial.getRGBA()); return new ITexture[] { TextureFactory.of(Blocks.iron_block), aIconSet }; } } return new ITexture[] { TextureFactory.of(Blocks.iron_block), - TextureFactory.of(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]) }; + TextureFactory.of(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]) }; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java index 79cb2438dd..ee5a0a1511 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java @@ -44,15 +44,18 @@ public class BW_MetaGeneratedFrames extends MetaPipeEntity { GT_OreDictUnificator.registerOre(OrePrefixes.frameGt, aMaterial, this.getStackForm(1)); GT_ModHandler.addCraftingRecipe( - this.getStackForm(2), - RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SSS", "SwS", "SSS", 'S', this.mMaterial.get(OrePrefixes.stick) }); + this.getStackForm(2), + RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SSS", "SwS", "SSS", 'S', this.mMaterial.get(OrePrefixes.stick) }); RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.getVarName(), 4), - ItemList.Circuit_Integrated.getWithDamage(0, 4)) - .itemOutputs(getStackForm(1)).duration(3 * SECONDS + 4 * TICKS).eut(8).addTo(assemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.getVarName(), 4), + ItemList.Circuit_Integrated.getWithDamage(0, 4)) + .itemOutputs(getStackForm(1)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(8) + .addTo(assemblerRecipes); } private BW_MetaGeneratedFrames(String aName, Werkstoff aMaterial) { @@ -71,10 +74,10 @@ public class BW_MetaGeneratedFrames extends MetaPipeEntity { } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, byte aConnections, - int aColorIndex, boolean aConnected, boolean aRedstone) { + int aColorIndex, boolean aConnected, boolean aRedstone) { return new ITexture[] { TextureFactory.of( - this.mMaterial.getTexSet().mTextures[OrePrefixes.frameGt.mTextureIndex], - Dyes.getModulation(aColorIndex, this.mMaterial.getRGBA())) }; + this.mMaterial.getTexSet().mTextures[OrePrefixes.frameGt.mTextureIndex], + Dyes.getModulation(aColorIndex, this.mMaterial.getRGBA())) }; } @Override @@ -119,13 +122,13 @@ public class BW_MetaGeneratedFrames extends MetaPipeEntity { @Override public final boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { + ItemStack aStack) { return false; } @Override public final boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { + ItemStack aStack) { return false; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedOreTE.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedOreTE.java index c53ef3f523..9b393dff0f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedOreTE.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedOreTE.java @@ -52,11 +52,11 @@ public class BW_MetaGeneratedOreTE extends BW_MetaGenerated_Block_TE { Werkstoff aMaterial = Werkstoff.werkstoffHashMap.get(this.mMetaData); if (aMaterial != null) { ITexture aIconSet = TextureFactory - .of(aMaterial.getTexSet().mTextures[OrePrefixes.ore.mTextureIndex], aMaterial.getRGBA()); + .of(aMaterial.getTexSet().mTextures[OrePrefixes.ore.mTextureIndex], aMaterial.getRGBA()); return new ITexture[] { TextureFactory.of(Blocks.stone), aIconSet }; } return new ITexture[] { TextureFactory.of(Blocks.stone), - TextureFactory.of(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.ore.mTextureIndex]) }; + TextureFactory.of(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.ore.mTextureIndex]) }; } @Override @@ -71,7 +71,8 @@ public class BW_MetaGeneratedOreTE extends BW_MetaGenerated_Block_TE { rList.add(new ItemStack(Blocks.cobblestone, 1, 0)); return rList; } - Materials aOreMaterial = Werkstoff.werkstoffHashMap.get(this.mMetaData).getBridgeMaterial(); + Materials aOreMaterial = Werkstoff.werkstoffHashMap.get(this.mMetaData) + .getBridgeMaterial(); if (shouldSilkTouch) { rList.add(new ItemStack(this.GetProperBlock(), 1, this.mMetaData)); } else { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedSmallOreTE.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedSmallOreTE.java index de4dbb1cbc..110b17321f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedSmallOreTE.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedSmallOreTE.java @@ -34,27 +34,22 @@ public class BW_MetaGeneratedSmallOreTE extends BW_MetaGeneratedOreTE { @Override public ArrayList<ItemStack> getDrops(int aFortune) { ArrayList<ItemStack> rList = new ArrayList<>(); - Materials aMaterial = Werkstoff.werkstoffHashMap.get(this.mMetaData).getBridgeMaterial(); + Materials aMaterial = Werkstoff.werkstoffHashMap.get(this.mMetaData) + .getBridgeMaterial(); if (aMaterial != null) { Random tRandom = new XSTR(this.xCoord ^ this.yCoord ^ this.zCoord); ArrayList<ItemStack> tSelector = new ArrayList<>(); - ItemStack tStack = GT_OreDictUnificator.get( - OrePrefixes.gemExquisite, - aMaterial, - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), - 1L); + ItemStack tStack = GT_OreDictUnificator + .get(OrePrefixes.gemExquisite, aMaterial, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 1L); if (tStack != null) { for (int i = 0; i < 1; i++) { tSelector.add(tStack); } } - tStack = GT_OreDictUnificator.get( - OrePrefixes.gemFlawless, - aMaterial, - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), - 1L); + tStack = GT_OreDictUnificator + .get(OrePrefixes.gemFlawless, aMaterial, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 1L); if (tStack != null) { for (int i = 0; i < 2; i++) { tSelector.add(tStack); @@ -67,10 +62,10 @@ public class BW_MetaGeneratedSmallOreTE extends BW_MetaGeneratedOreTE { } } tStack = GT_OreDictUnificator.get( - OrePrefixes.gemFlawed, - aMaterial, - GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1L), - 1L); + OrePrefixes.gemFlawed, + aMaterial, + GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1L), + 1L); if (tStack != null) { for (int i = 0; i < 5; i++) { tSelector.add(tStack); @@ -83,10 +78,10 @@ public class BW_MetaGeneratedSmallOreTE extends BW_MetaGeneratedOreTE { } } tStack = GT_OreDictUnificator.get( - OrePrefixes.gemChipped, - aMaterial, - GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), - 1L); + OrePrefixes.gemChipped, + aMaterial, + GT_OreDictUnificator.get(OrePrefixes.dustImpure, aMaterial, 1L), + 1L); if (tStack != null) { for (int i = 0; i < 5; i++) { tSelector.add(tStack); @@ -107,10 +102,8 @@ public class BW_MetaGeneratedSmallOreTE extends BW_MetaGeneratedOreTE { } if (tRandom.nextInt(3 + aFortune) > 1) { rList.add( - GT_OreDictUnificator.get( - tRandom.nextInt(3) > 0 ? OrePrefixes.dustImpure : OrePrefixes.dust, - Materials.Stone, - 1L)); + GT_OreDictUnificator + .get(tRandom.nextInt(3) > 0 ? OrePrefixes.dustImpure : OrePrefixes.dust, Materials.Stone, 1L)); } } return rList; @@ -121,11 +114,11 @@ public class BW_MetaGeneratedSmallOreTE extends BW_MetaGeneratedOreTE { Werkstoff aMaterial = Werkstoff.werkstoffHashMap.get(this.mMetaData); if (aMaterial != null) { ITexture aIconSet = TextureFactory - .of(aMaterial.getTexSet().mTextures[OrePrefixes.oreSmall.mTextureIndex], aMaterial.getRGBA()); + .of(aMaterial.getTexSet().mTextures[OrePrefixes.oreSmall.mTextureIndex], aMaterial.getRGBA()); return new ITexture[] { TextureFactory.of(Blocks.stone), aIconSet }; } - return new ITexture[] { TextureFactory.of(Blocks.stone), TextureFactory - .of(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.oreSmall.mTextureIndex]) }; + return new ITexture[] { TextureFactory.of(Blocks.stone), + TextureFactory.of(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.oreSmall.mTextureIndex]) }; } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Block_TE.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Block_TE.java index e29de514a5..77d3c23fbc 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Block_TE.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Block_TE.java @@ -52,10 +52,10 @@ public abstract class BW_MetaGenerated_Block_TE extends TileEntity implements IT @Override public Packet getDescriptionPacket() { if (!this.worldObj.isRemote) BW_Network_instance.sendPacketToAllPlayersInRange( - this.worldObj, - new MetaBlockPacket(this.xCoord, (short) this.yCoord, this.zCoord, this.mMetaData), - this.xCoord, - this.zCoord); + this.worldObj, + new MetaBlockPacket(this.xCoord, (short) this.yCoord, this.zCoord, this.mMetaData), + this.xCoord, + this.zCoord); return null; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Blocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Blocks.java index 84bcb5ffef..84a498070a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Blocks.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Blocks.java @@ -44,7 +44,7 @@ public abstract class BW_MetaGenerated_Blocks extends BW_TileEntityContainer { } public BW_MetaGenerated_Blocks(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, String blockName, - OrePrefixes types) { + OrePrefixes types) { super(p_i45386_1_, tileEntity, blockName); this.setHardness(5.0F); this.setResistance(5.0F); @@ -53,8 +53,8 @@ public abstract class BW_MetaGenerated_Blocks extends BW_TileEntityContainer { this._prefixes = types; if (this._prefixes != null) { this.blockTypeLocalizedName = GT_LanguageManager.addStringLocalization( - "bw.blocktype." + this._prefixes, - this._prefixes.mLocalizedMaterialPre + "%material" + this._prefixes.mLocalizedMaterialPost); + "bw.blocktype." + this._prefixes, + this._prefixes.mLocalizedMaterialPre + "%material" + this._prefixes.mLocalizedMaterialPost); } Werkstoff.werkstoffHashSet.forEach(this::doRegistrationStuff); } @@ -124,6 +124,8 @@ public abstract class BW_MetaGenerated_Blocks extends BW_TileEntityContainer { if (tTileEntity instanceof BW_MetaGenerated_Block_TE metaTE) { return metaTE.getDrops(aFortune); } - return mTemporaryTileEntity.get() == null ? new ArrayList<>() : mTemporaryTileEntity.get().getDrops(aFortune); + return mTemporaryTileEntity.get() == null ? new ArrayList<>() + : mTemporaryTileEntity.get() + .getDrops(aFortune); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java index 7f9a3196dd..4c355284ae 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java @@ -66,16 +66,16 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item implements IRa super("bwMetaGeneratedGTEnhancement" + orePrefixes.name(), (short) 32766, (short) 0); this.orePrefixes = orePrefixes; this.itemTypeLocalizedName = GT_LanguageManager.addStringLocalization( - "bw.itemtype." + orePrefixes, - orePrefixes.mLocalizedMaterialPre + "%material" + orePrefixes.mLocalizedMaterialPost); + "bw.itemtype." + orePrefixes, + orePrefixes.mLocalizedMaterialPre + "%material" + orePrefixes.mLocalizedMaterialPost); } public BW_MetaGenerated_Items(OrePrefixes orePrefixes) { super("bwMetaGenerated" + orePrefixes.name(), (short) 32766, (short) 0); this.orePrefixes = orePrefixes; this.itemTypeLocalizedName = GT_LanguageManager.addStringLocalization( - "bw.itemtype." + orePrefixes, - orePrefixes.mLocalizedMaterialPre + "%material" + orePrefixes.mLocalizedMaterialPost); + "bw.itemtype." + orePrefixes, + orePrefixes.mLocalizedMaterialPre + "%material" + orePrefixes.mLocalizedMaterialPost); this.setCreativeTab(BW_MetaGenerated_Items.metaTab); for (Werkstoff w : werkstoffHashSet) { ItemStack tStack = new ItemStack(this, 1, w.getmID()); @@ -87,8 +87,9 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item implements IRa @Override public boolean onEntityItemUpdate(EntityItem aItemEntity) { if (this.orePrefixes == OrePrefixes.dustImpure || this.orePrefixes == OrePrefixes.dustPure - || this.orePrefixes == OrePrefixes.crushed) { - int aDamage = aItemEntity.getEntityItem().getItemDamage(); + || this.orePrefixes == OrePrefixes.crushed) { + int aDamage = aItemEntity.getEntityItem() + .getItemDamage(); if (aDamage >= 0 && !aItemEntity.worldObj.isRemote) { Werkstoff aMaterial = werkstoffHashMap.get((short) aDamage); if (aMaterial != null && aMaterial != Werkstoff.default_null_Werkstoff) { @@ -100,18 +101,18 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item implements IRa if (tBlock == Blocks.cauldron && tMetaData > 0) { if (this.orePrefixes == OrePrefixes.dustImpure || this.orePrefixes == OrePrefixes.dustPure) { aItemEntity.setEntityItemStack( - WerkstoffLoader.getCorrespondingItemStack( - OrePrefixes.dust, - aMaterial, - aItemEntity.getEntityItem().stackSize)); + WerkstoffLoader.getCorrespondingItemStack( + OrePrefixes.dust, + aMaterial, + aItemEntity.getEntityItem().stackSize)); aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); return true; } else { aItemEntity.setEntityItemStack( - WerkstoffLoader.getCorrespondingItemStack( - OrePrefixes.crushedPurified, - aMaterial, - aItemEntity.getEntityItem().stackSize)); + WerkstoffLoader.getCorrespondingItemStack( + OrePrefixes.crushedPurified, + aMaterial, + aItemEntity.getEntityItem().stackSize)); aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); return true; } @@ -131,7 +132,7 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item implements IRa aList.add(GT_LanguageManager.getTranslation("metaitem.01.tooltip.purify.2")); if (aStack != null && aStack.getItem() instanceof BW_MetaGenerated_Items - && aStack.getItemDamage() == WerkstoffLoader.Tiberium.getmID()) + && aStack.getItemDamage() == WerkstoffLoader.Tiberium.getmID()) aList.add(GT_LanguageManager.getTranslation("metaitem.01.tooltip.nqgen")); Werkstoff werkstoff = werkstoffHashMap.get((short) this.getDamage(aStack)); @@ -164,12 +165,15 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item implements IRa public IIconContainer getIconContainer(int aMetaData) { if (werkstoffHashMap.get((short) aMetaData) == null) return null; if (this.orePrefixes.mTextureIndex == -1) return this.getIconContainerBartWorks(aMetaData); - return werkstoffHashMap.get((short) aMetaData).getTexSet().mTextures[this.orePrefixes.mTextureIndex]; + return werkstoffHashMap.get((short) aMetaData) + .getTexSet().mTextures[this.orePrefixes.mTextureIndex]; } protected IIconContainer getIconContainerBartWorks(int aMetaData) { if (SideReference.Side.Client) return PrefixTextureLinker.texMap.get(this.orePrefixes) - .get(werkstoffHashMap.get((short) aMetaData).getTexSet()); + .get( + werkstoffHashMap.get((short) aMetaData) + .getTexSet()); return null; } @@ -200,11 +204,13 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item implements IRa Werkstoff w = werkstoffHashMap.get((short) aStack.getItemDamage()); if (w == null || w.getStats() == null) return; - if (w.getStats().isToxic() && !GT_Utility.isWearingFullBioHazmat(bPlayer)) { + if (w.getStats() + .isToxic() && !GT_Utility.isWearingFullBioHazmat(bPlayer)) { bPlayer.addPotionEffect(new PotionEffect(Potion.poison.getId(), 80, 4)); } - if (w.getStats().isRadioactive() && !GT_Utility.isWearingFullRadioHazmat(bPlayer)) { + if (w.getStats() + .isRadioactive() && !GT_Utility.isWearingFullRadioHazmat(bPlayer)) { bPlayer.addPotionEffect(new PotionEffect(IC2Potion.radiation.id, 80, 4)); } } @@ -227,7 +233,11 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item implements IRa @Override public int getRadiationLevel(ItemStack aStack) { Werkstoff w = werkstoffHashMap.get((short) aStack.getItemDamage()); - return w.getStats().isRadioactive() ? (int) w.getStats().getProtons() : 0; + return w.getStats() + .isRadioactive() + ? (int) w.getStats() + .getProtons() + : 0; } @Override @@ -250,16 +260,13 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item implements IRa @Override public int getCapacity(ItemStack aStack) { return this.orePrefixes == OrePrefixes.capsule || this.orePrefixes == OrePrefixes.cell - || this.orePrefixes == OrePrefixes.cellPlasma - ? 1000 - : this.orePrefixes == OrePrefixes.cellMolten || this.orePrefixes == OrePrefixes.capsuleMolten - ? 144 - : 0; + || this.orePrefixes == OrePrefixes.cellPlasma ? 1000 + : this.orePrefixes == OrePrefixes.cellMolten || this.orePrefixes == OrePrefixes.capsuleMolten ? 144 : 0; } @Override public ItemStack getContainerItem(ItemStack aStack) { return this.orePrefixes == OrePrefixes.cell || this.orePrefixes == OrePrefixes.cellPlasma - || this.orePrefixes == OrePrefixes.cellMolten ? Materials.Empty.getCells(1) : null; + || this.orePrefixes == OrePrefixes.cellMolten ? Materials.Empty.getCells(1) : null; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java index 7f1e56607f..2adb0d3d35 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java @@ -41,8 +41,8 @@ public class BW_MetaGenerated_Ores extends BW_MetaGenerated_Blocks { public BW_MetaGenerated_Ores(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, String blockName) { super(p_i45386_1_, tileEntity, blockName); this.blockTypeLocalizedName = GT_LanguageManager.addStringLocalization( - "bw.blocktype." + OrePrefixes.ore, - OrePrefixes.ore.mLocalizedMaterialPre + "%material" + OrePrefixes.ore.mLocalizedMaterialPost); + "bw.blocktype." + OrePrefixes.ore, + OrePrefixes.ore.mLocalizedMaterialPre + "%material" + OrePrefixes.ore.mLocalizedMaterialPost); } @Override @@ -54,7 +54,7 @@ public class BW_MetaGenerated_Ores extends BW_MetaGenerated_Blocks { } public static boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData, boolean air, Block block, - int[] aBlockMeta) { + int[] aBlockMeta) { if (!air) { aY = MathUtils.clamp(aY, 1, aWorld.getActualHeight()); } @@ -62,11 +62,12 @@ public class BW_MetaGenerated_Ores extends BW_MetaGenerated_Blocks { Block tBlock = aWorld.getBlock(aX, aY, aZ); Block tOreBlock = WerkstoffLoader.BWOres; if (aMetaData < 0 || tBlock == Blocks.air && !air - || Block.getIdFromBlock(tBlock) != Block.getIdFromBlock(block)) { + || Block.getIdFromBlock(tBlock) != Block.getIdFromBlock(block)) { return false; } final int aaY = aY; - if (Arrays.stream(aBlockMeta).noneMatch(e -> e == aWorld.getBlockMetadata(aX, aaY, aZ))) { + if (Arrays.stream(aBlockMeta) + .noneMatch(e -> e == aWorld.getBlockMetadata(aX, aaY, aZ))) { return false; } @@ -104,7 +105,7 @@ public class BW_MetaGenerated_Ores extends BW_MetaGenerated_Blocks { public void getSubBlocks(Item aItem, CreativeTabs aTab, List<ItemStack> aList) { for (Werkstoff tMaterial : Werkstoff.werkstoffHashSet) { if (tMaterial != null && tMaterial.hasItemType(OrePrefixes.ore) - && (tMaterial.getGenerationFeatures().blacklist & 0x8) == 0) { + && (tMaterial.getGenerationFeatures().blacklist & 0x8) == 0) { aList.add(new ItemStack(aItem, 1, tMaterial.getmID())); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java index fc6b757361..0778645cb5 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_SmallOres.java @@ -30,8 +30,8 @@ public class BW_MetaGenerated_SmallOres extends BW_MetaGenerated_Ores { public BW_MetaGenerated_SmallOres(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, String blockName) { super(p_i45386_1_, tileEntity, blockName); this.blockTypeLocalizedName = GT_LanguageManager.addStringLocalization( - "bw.blocktype." + OrePrefixes.oreSmall, - OrePrefixes.oreSmall.mLocalizedMaterialPre + "%material" + OrePrefixes.oreSmall.mLocalizedMaterialPost); + "bw.blocktype." + OrePrefixes.oreSmall, + OrePrefixes.oreSmall.mLocalizedMaterialPre + "%material" + OrePrefixes.oreSmall.mLocalizedMaterialPost); } @Override @@ -48,7 +48,7 @@ public class BW_MetaGenerated_SmallOres extends BW_MetaGenerated_Ores { } public static boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData, boolean air, Block block, - int[] aBlockMeta) { + int[] aBlockMeta) { if (!air) { aY = Math.min(aWorld.getActualHeight(), Math.max(aY, 1)); } @@ -56,11 +56,12 @@ public class BW_MetaGenerated_SmallOres extends BW_MetaGenerated_Ores { Block tBlock = aWorld.getBlock(aX, aY, aZ); Block tOreBlock = WerkstoffLoader.BWSmallOres; if (aMetaData < 0 || tBlock == Blocks.air && !air - || Block.getIdFromBlock(tBlock) != Block.getIdFromBlock(block)) { + || Block.getIdFromBlock(tBlock) != Block.getIdFromBlock(block)) { return false; } final int aaY = aY; - if (Arrays.stream(aBlockMeta).noneMatch(e -> e == aWorld.getBlockMetadata(aX, aaY, aZ))) { + if (Arrays.stream(aBlockMeta) + .noneMatch(e -> e == aWorld.getBlockMetadata(aX, aaY, aZ))) { return false; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlock_TE.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlock_TE.java index f82b90863a..4456a66535 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlock_TE.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlock_TE.java @@ -34,14 +34,13 @@ public class BW_MetaGenerated_WerkstoffBlock_TE extends BW_MetaGenerated_Block_T if (aMaterial != null) { TextureSet set = aMaterial.getTexSet(); ITexture aIconSet = TextureFactory.of( - set.mTextures[PrefixTextureLinker.blockTexMap - .getOrDefault(set, OrePrefixes.block.mTextureIndex)], - aMaterial.getRGBA()); + set.mTextures[PrefixTextureLinker.blockTexMap.getOrDefault(set, OrePrefixes.block.mTextureIndex)], + aMaterial.getRGBA()); return new ITexture[] { TextureFactory.of(Blocks.iron_block), aIconSet }; } } return new ITexture[] { TextureFactory.of(Blocks.iron_block), - TextureFactory.of(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]) }; + TextureFactory.of(gregtech.api.enums.TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex]) }; } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlocks.java index 8e149391cd..648f9a0027 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlocks.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_WerkstoffBlocks.java @@ -30,11 +30,11 @@ import gregtech.api.util.GT_LanguageManager; public class BW_MetaGenerated_WerkstoffBlocks extends BW_MetaGenerated_Blocks { public BW_MetaGenerated_WerkstoffBlocks(Material p_i45386_1_, Class<? extends TileEntity> tileEntity, - String blockName) { + String blockName) { super(p_i45386_1_, tileEntity, blockName); this.blockTypeLocalizedName = GT_LanguageManager.addStringLocalization( - "bw.blocktype." + OrePrefixes.block, - OrePrefixes.block.mLocalizedMaterialPre + "%material" + OrePrefixes.block.mLocalizedMaterialPost); + "bw.blocktype." + OrePrefixes.block, + OrePrefixes.block.mLocalizedMaterialPre + "%material" + OrePrefixes.block.mLocalizedMaterialPost); } @Override @@ -58,7 +58,8 @@ public class BW_MetaGenerated_WerkstoffBlocks extends BW_MetaGenerated_Blocks { @Override public void getSubBlocks(Item aItem, CreativeTabs tab, List<ItemStack> aList) { Werkstoff.werkstoffHashSet.stream() - .filter(tMaterial -> tMaterial.hasItemType(OrePrefixes.gem) || tMaterial.hasItemType(OrePrefixes.ingot)) - .map(tMaterial -> new ItemStack(aItem, 1, tMaterial.getmID())).forEach(aList::add); + .filter(tMaterial -> tMaterial.hasItemType(OrePrefixes.gem) || tMaterial.hasItemType(OrePrefixes.ingot)) + .map(tMaterial -> new ItemStack(aItem, 1, tMaterial.getmID())) + .forEach(aList::add); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_NonMeta_MaterialItems.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_NonMeta_MaterialItems.java index 3315bfea4c..db53437858 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_NonMeta_MaterialItems.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_NonMeta_MaterialItems.java @@ -83,7 +83,7 @@ public enum BW_NonMeta_MaterialItems implements IItemContainer { public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) { if (GT_Utility.isStackInvalid(aStack)) return false; return GT_Utility - .areUnificationsEqual((ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1), aIgnoreNBT); + .areUnificationsEqual((ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1), aIgnoreNBT); } @Override @@ -116,7 +116,7 @@ public enum BW_NonMeta_MaterialItems implements IItemContainer { throw new IllegalAccessError("The Enum '" + this.name() + "' has not been set to an Item at this time!"); if (GT_Utility.isStackInvalid(this.mStack)) return GT_Utility.copyAmount(aAmount, aReplacements); return GT_Utility - .copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(this.mStack)); + .copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(this.mStack)); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java index 91d5a87dd5..99eb6e7d7e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java @@ -72,24 +72,26 @@ public class BW_Meta_Items { BW_Meta_Items.NEWCIRCUITS.addItem(3, "Imprint supporting Board", "A Board needed for Circuit Imprints"); GT_Values.RA.stdBuilder() - .itemInputs( - WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.dust, 1), - WerkstoffLoader.ArInGaPhoBiBoTe.get(OrePrefixes.dust, 4)) - .itemOutputs(BW_Meta_Items.NEWCIRCUITS.getStack(2)).duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(formingPressRecipes); + .itemInputs( + WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.dust, 1), + WerkstoffLoader.ArInGaPhoBiBoTe.get(OrePrefixes.dust, 4)) + .itemOutputs(BW_Meta_Items.NEWCIRCUITS.getStack(2)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(formingPressRecipes); RecipeMaps.autoclaveRecipes.add( - new GT_Recipe( - false, - new ItemStack[] { BW_Meta_Items.NEWCIRCUITS.getStack(2) }, - new ItemStack[] { BW_Meta_Items.NEWCIRCUITS.getStack(3) }, - null, - new int[] { 7500 }, - new FluidStack[] { Materials.SolderingAlloy.getMolten(576) }, - null, - 300, - (int) TierEU.RECIPE_EV, - BW_Util.CLEANROOM)); + new GT_Recipe( + false, + new ItemStack[] { BW_Meta_Items.NEWCIRCUITS.getStack(2) }, + new ItemStack[] { BW_Meta_Items.NEWCIRCUITS.getStack(3) }, + null, + new int[] { 7500 }, + new FluidStack[] { Materials.SolderingAlloy.getMolten(576) }, + null, + 300, + (int) TierEU.RECIPE_EV, + BW_Util.CLEANROOM)); } public void addNewCircuit(int aTier, int aID, String aName) { @@ -157,11 +159,11 @@ public class BW_Meta_Items { public final ItemStack addCircuit(int aID, String aEnglish, String aToolTip, int tier) { CircuitImprintLoader.bwCircuitTagMap.put( - new CircuitData( - BW_Util.getMachineVoltageFromTier(Math.min(1, tier - 2)), - tier > 2 ? BW_Util.CLEANROOM : 0, - (byte) tier), - new ItemStack(BW_Meta_Items.NEWCIRCUITS, 1, aID)); + new CircuitData( + BW_Util.getMachineVoltageFromTier(Math.min(1, tier - 2)), + tier > 2 ? BW_Util.CLEANROOM : 0, + (byte) tier), + new ItemStack(BW_Meta_Items.NEWCIRCUITS, 1, aID)); return this.addItem(aID, aEnglish, aToolTip, SubTag.NO_UNIFICATION); } @@ -201,29 +203,31 @@ public class BW_Meta_Items { for (short i = 0; i < CircuitImprintLoader.reverseIDs; ++i) { if (this.mEnabledItems.get(i)) { BW_Util.set2DCoordTo1DArray( - i, - 0, - 2, - aIconRegister.registerIcon( - "gregtech:" + (GT_Config.troll ? "troll" : this.getUnlocalizedName() + "/" + i)), - this.mIconList); + i, + 0, + 2, + aIconRegister.registerIcon( + "gregtech:" + (GT_Config.troll ? "troll" : this.getUnlocalizedName() + "/" + i)), + this.mIconList); } } for (short i = CircuitImprintLoader.reverseIDs; i < Short.MAX_VALUE; i++) { if (this.mEnabledItems.get(i)) { BW_Util.set2DCoordTo1DArray( - i, - 0, - 2, - Objects.requireNonNull(CircuitImprintLoader.circuitIIconRefs.get(i)).get(1).getIconIndex(), - this.mIconList); + i, + 0, + 2, + Objects.requireNonNull(CircuitImprintLoader.circuitIIconRefs.get(i)) + .get(1) + .getIconIndex(), + this.mIconList); BW_Util.set2DCoordTo1DArray( - i, - 1, - 2, - aIconRegister.registerIcon(MainMod.MOD_ID + ":WrapOverlay"), - this.mIconList); + i, + 1, + 2, + aIconRegister.registerIcon(MainMod.MOD_ID + ":WrapOverlay"), + this.mIconList); } } } @@ -231,18 +235,18 @@ public class BW_Meta_Items { @Override protected void addAdditionalToolTips(List<String> aList, ItemStack aStack, EntityPlayer aPlayer) { if (aStack.getItemDamage() == 0) if (aStack.getTagCompound() != null - && CircuitImprintLoader.getStackFromTag(aStack.getTagCompound()) != null) + && CircuitImprintLoader.getStackFromTag(aStack.getTagCompound()) != null) aList.add( - "An Imprint for: " + GT_LanguageManager.getTranslation( - GT_LanguageManager.getTranslateableItemStackName( - CircuitImprintLoader.getStackFromTag(aStack.getTagCompound())))); + "An Imprint for: " + GT_LanguageManager.getTranslation( + GT_LanguageManager.getTranslateableItemStackName( + CircuitImprintLoader.getStackFromTag(aStack.getTagCompound())))); else aList.add("An Imprint for a Circuit"); else if (aStack.getItemDamage() == 1) if (aStack.getTagCompound() != null - && CircuitImprintLoader.getStackFromTag(aStack.getTagCompound()) != null) + && CircuitImprintLoader.getStackFromTag(aStack.getTagCompound()) != null) aList.add( - "A Sliced " + GT_LanguageManager.getTranslation( - GT_LanguageManager.getTranslateableItemStackName( - CircuitImprintLoader.getStackFromTag(aStack.getTagCompound())))); + "A Sliced " + GT_LanguageManager.getTranslation( + GT_LanguageManager.getTranslateableItemStackName( + CircuitImprintLoader.getStackFromTag(aStack.getTagCompound())))); else aList.add("A Sliced Circuit"); super.addAdditionalToolTips(aList, aStack, aPlayer); } @@ -380,7 +384,7 @@ public class BW_Meta_Items { @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, - int useRemaining) { + int useRemaining) { return this.getIconFromDamage(stack.getItemDamage()); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitData.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitData.java index 49fba31ec8..874ae202f1 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitData.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitData.java @@ -40,10 +40,14 @@ public class CircuitData { @Override public int hashCode() { return MurmurHash3.murmurhash3_x86_32( - ByteBuffer.allocate(13).put(this.aTier).putInt(this.aSpecial).putLong(this.aVoltage).array(), - 0, - 13, - 31); + ByteBuffer.allocate(13) + .put(this.aTier) + .putInt(this.aSpecial) + .putLong(this.aVoltage) + .array(), + 0, + 13, + 31); } public long getaVoltage() { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java index fd5cfeb38d..5d3886b9e9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java @@ -76,7 +76,8 @@ public class CircuitImprintLoader { } private static void reAddOriginalRecipes() { - RecipeMaps.circuitAssemblerRecipes.getBackend().removeRecipes(MODIFIED_CAL_RECIPES); + RecipeMaps.circuitAssemblerRecipes.getBackend() + .removeRecipes(MODIFIED_CAL_RECIPES); ORIGINAL_CAL_RECIPES.forEach(RecipeMaps.circuitAssemblerRecipes::add); ORIGINAL_CAL_RECIPES.clear(); MODIFIED_CAL_RECIPES.clear(); @@ -85,30 +86,30 @@ public class CircuitImprintLoader { private static void rebuildCircuitAssemblerMap(HashSet<GT_Recipe> toRem, HashSet<GT_Recipe> toAdd) { reAddOriginalRecipes(); RecipeMaps.circuitAssemblerRecipes.getAllRecipes() - .forEach(e -> CircuitImprintLoader.handleCircuitRecipeRebuilding(e, toRem, toAdd)); + .forEach(e -> CircuitImprintLoader.handleCircuitRecipeRebuilding(e, toRem, toAdd)); } private static void handleCircuitRecipeRebuilding(GT_Recipe circuitRecipe, HashSet<GT_Recipe> toRem, - HashSet<GT_Recipe> toAdd) { + HashSet<GT_Recipe> toAdd) { ItemStack[] outputs = circuitRecipe.mOutputs; boolean isOrePass = isCircuitOreDict(outputs[0]); String unlocalizedName = outputs[0].getUnlocalizedName(); if (isOrePass || unlocalizedName.contains("Circuit") || unlocalizedName.contains("circuit")) { CircuitImprintLoader.recipeTagMap - .put(CircuitImprintLoader.getTagFromStack(outputs[0]), circuitRecipe.copy()); + .put(CircuitImprintLoader.getTagFromStack(outputs[0]), circuitRecipe.copy()); Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null - ? FluidRegistry.getFluid("molten.indalloy140") - : FluidRegistry.getFluid("molten.solderingalloy"); + ? FluidRegistry.getFluid("molten.indalloy140") + : FluidRegistry.getFluid("molten.solderingalloy"); Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null - ? FluidRegistry.getFluid("molten.mutatedlivingsolder") - : FluidRegistry.getFluid("molten.solderingalloy"); + ? FluidRegistry.getFluid("molten.mutatedlivingsolder") + : FluidRegistry.getFluid("molten.solderingalloy"); if (circuitRecipe.mFluidInputs[0].isFluidEqual(Materials.SolderingAlloy.getMolten(0)) - || circuitRecipe.mFluidInputs[0].isFluidEqual(new FluidStack(solderIndalloy, 0)) - || circuitRecipe.mFluidInputs[0].isFluidEqual(new FluidStack(solderUEV, 0))) { + || circuitRecipe.mFluidInputs[0].isFluidEqual(new FluidStack(solderIndalloy, 0)) + || circuitRecipe.mFluidInputs[0].isFluidEqual(new FluidStack(solderUEV, 0))) { GT_Recipe newRecipe = CircuitImprintLoader.reBuildRecipe(circuitRecipe); if (newRecipe != null) BartWorksRecipeMaps.circuitAssemblyLineRecipes.addRecipe(newRecipe); addCutoffRecipeToSets(toRem, toAdd, circuitRecipe); @@ -117,19 +118,21 @@ public class CircuitImprintLoader { } private static boolean isCircuitOreDict(ItemStack item) { - return BW_Util.isTieredCircuit(item) - || BW_Util.getOreNames(item).stream().anyMatch(s -> "circuitPrimitiveArray".equals(s)); + return BW_Util.isTieredCircuit(item) || BW_Util.getOreNames(item) + .stream() + .anyMatch(s -> "circuitPrimitiveArray".equals(s)); } private static void exchangeRecipesInList(HashSet<GT_Recipe> toRem, HashSet<GT_Recipe> toAdd) { toAdd.forEach(RecipeMaps.circuitAssemblerRecipes::add); - RecipeMaps.circuitAssemblerRecipes.getBackend().removeRecipes(toRem); + RecipeMaps.circuitAssemblerRecipes.getBackend() + .removeRecipes(toRem); ORIGINAL_CAL_RECIPES.addAll(toRem); MODIFIED_CAL_RECIPES.addAll(toAdd); } private static void addCutoffRecipeToSets(HashSet<GT_Recipe> toRem, HashSet<GT_Recipe> toAdd, - GT_Recipe circuitRecipe) { + GT_Recipe circuitRecipe) { if (circuitRecipe.mEUt > BW_Util.getTierVoltage(ConfigHandler.cutoffTier)) { toRem.add(circuitRecipe); toAdd.add(CircuitImprintLoader.makeMoreExpensive(circuitRecipe)); @@ -142,8 +145,8 @@ public class CircuitImprintLoader { for (ItemStack is : newRecipe.mInputs) { if (!BW_Util.isTieredCircuit(is)) { is.stackSize = Math.min(is.stackSize * 6, 64); - if (is.stackSize > is.getItem().getItemStackLimit() || is.stackSize > is.getMaxStackSize()) - is.stackSize = is.getMaxStackSize(); + if (is.stackSize > is.getItem() + .getItemStackLimit() || is.stackSize > is.getMaxStackSize()) is.stackSize = is.getMaxStackSize(); } } newRecipe.mFluidInputs[0].amount *= 4; @@ -171,42 +174,43 @@ public class CircuitImprintLoader { } return new GT_Recipe( - false, - in, - new ItemStack[] { getOutputMultiplied(original) }, - BW_Meta_Items.getNEWCIRCUITS() - .getStackWithNBT(CircuitImprintLoader.getTagFromStack(original.mOutputs[0]), 0, 0), - null, - original.mFluidInputs, - null, - original.mDuration * 12, - original.mEUt, - 0); + false, + in, + new ItemStack[] { getOutputMultiplied(original) }, + BW_Meta_Items.getNEWCIRCUITS() + .getStackWithNBT(CircuitImprintLoader.getTagFromStack(original.mOutputs[0]), 0, 0), + null, + original.mFluidInputs, + null, + original.mDuration * 12, + original.mEUt, + 0); } private static ItemStack getOutputMultiplied(GT_Recipe original) { - ItemStack out = original.copy().getOutput(0); + ItemStack out = original.copy() + .getOutput(0); out.stackSize *= 16; return out; } private static void replaceCircuits(BiMap<ItemList, Short> inversed, GT_Recipe original, ItemStack[] in, - int index) { + int index) { for (ItemList il : inversed.keySet()) { if (GT_Utility.areStacksEqual(il.get(1), replaceCircuitParts(original.mInputs[index]))) { in[index] = BW_Meta_Items.getNEWCIRCUITS() - .getStack(inversed.get(il), original.mInputs[index].stackSize); + .getStack(inversed.get(il), original.mInputs[index].stackSize); } } } private static final List<Pair<ItemStack, ItemStack>> circuitPartsToReplace = Collections.unmodifiableList( - Arrays.asList( - new Pair<>(ItemList.Circuit_Parts_Resistor.get(1), ItemList.Circuit_Parts_ResistorSMD.get(1)), - new Pair<>(ItemList.Circuit_Parts_Diode.get(1), ItemList.Circuit_Parts_DiodeSMD.get(1)), - new Pair<>(ItemList.Circuit_Parts_Transistor.get(1), ItemList.Circuit_Parts_TransistorSMD.get(1)), - new Pair<>(ItemList.Circuit_Parts_Capacitor.get(1), ItemList.Circuit_Parts_CapacitorSMD.get(1)), - new Pair<>(ItemList.Circuit_Parts_Coil.get(1), ItemList.Circuit_Parts_InductorSMD.get(1)))); + Arrays.asList( + new Pair<>(ItemList.Circuit_Parts_Resistor.get(1), ItemList.Circuit_Parts_ResistorSMD.get(1)), + new Pair<>(ItemList.Circuit_Parts_Diode.get(1), ItemList.Circuit_Parts_DiodeSMD.get(1)), + new Pair<>(ItemList.Circuit_Parts_Transistor.get(1), ItemList.Circuit_Parts_TransistorSMD.get(1)), + new Pair<>(ItemList.Circuit_Parts_Capacitor.get(1), ItemList.Circuit_Parts_CapacitorSMD.get(1)), + new Pair<>(ItemList.Circuit_Parts_Coil.get(1), ItemList.Circuit_Parts_InductorSMD.get(1)))); private static ItemStack replaceCircuitParts(ItemStack stack) { for (Pair<ItemStack, ItemStack> pair : circuitPartsToReplace) { @@ -221,45 +225,46 @@ public class CircuitImprintLoader { @SuppressWarnings("deprecation") private static void replaceComponents(ItemStack[] in, GT_Recipe original, int index) - throws ArrayIndexOutOfBoundsException { + throws ArrayIndexOutOfBoundsException { if (original.mInputs[index] != null && in[index] == null) { // big wires if (BW_Util.checkStackAndPrefix(original.mInputs[index]) - && GT_OreDictUnificator.getAssociation(original.mInputs[index]).mPrefix == OrePrefixes.wireGt01) { + && GT_OreDictUnificator.getAssociation(original.mInputs[index]).mPrefix == OrePrefixes.wireGt01) { in[index] = GT_OreDictUnificator.get( - OrePrefixes.wireGt16, - GT_OreDictUnificator.getAssociation(original.mInputs[index]).mMaterial.mMaterial, - original.mInputs[index].stackSize); + OrePrefixes.wireGt16, + GT_OreDictUnificator.getAssociation(original.mInputs[index]).mMaterial.mMaterial, + original.mInputs[index].stackSize); // fine wires } else if (BW_Util.checkStackAndPrefix(original.mInputs[index]) - && GT_OreDictUnificator.getAssociation(original.mInputs[index]).mPrefix == OrePrefixes.wireFine) { + && GT_OreDictUnificator.getAssociation(original.mInputs[index]).mPrefix == OrePrefixes.wireFine) { + in[index] = GT_OreDictUnificator.get( + OrePrefixes.wireGt04, + GT_OreDictUnificator.getAssociation(original.mInputs[index]).mMaterial.mMaterial, + original.mInputs[index].stackSize); + if (in[index] == null) { in[index] = GT_OreDictUnificator.get( - OrePrefixes.wireGt04, - GT_OreDictUnificator.getAssociation(original.mInputs[index]).mMaterial.mMaterial, - original.mInputs[index].stackSize); - if (in[index] == null) { - in[index] = GT_OreDictUnificator.get( - OrePrefixes.wireFine, - GT_OreDictUnificator.getAssociation(original.mInputs[index]).mMaterial.mMaterial, - original.mInputs[index].stackSize * 16); - } - // other components - } else { - in[index] = original.mInputs[index].copy(); - in[index].stackSize *= 16; - if (in[index].stackSize > in[index].getItem().getItemStackLimit() - || in[index].stackSize > in[index].getMaxStackSize()) - in[index].stackSize = in[index].getMaxStackSize(); + OrePrefixes.wireFine, + GT_OreDictUnificator.getAssociation(original.mInputs[index]).mMaterial.mMaterial, + original.mInputs[index].stackSize * 16); } + // other components + } else { + in[index] = original.mInputs[index].copy(); + in[index].stackSize *= 16; + if (in[index].stackSize > in[index].getItem() + .getItemStackLimit() || in[index].stackSize > in[index].getMaxStackSize()) + in[index].stackSize = in[index].getMaxStackSize(); + } } } private static void makeCircuitImprintRecipes() { removeOldRecipesFromRegistries(); - CircuitImprintLoader.recipeTagMap.keySet().forEach(e -> { - makeAndAddSlicingRecipe(e); - makeAndAddCraftingRecipes(e); - }); + CircuitImprintLoader.recipeTagMap.keySet() + .forEach(e -> { + makeAndAddSlicingRecipe(e); + makeAndAddCraftingRecipes(e); + }); } private static boolean checkForBlacklistedComponents(ItemStack[] itemStacks) { @@ -272,12 +277,16 @@ public class CircuitImprintLoader { } private static void removeOldRecipesFromRegistries() { - recipeWorldCache.forEach(CraftingManager.getInstance().getRecipeList()::remove); + recipeWorldCache.forEach( + CraftingManager.getInstance() + .getRecipeList()::remove); BWCoreStaticReplacementMethodes.clearRecentlyUsedRecipes(); - RecipeMaps.slicerRecipes.getBackend().removeRecipes(gtrecipeWorldCache); + RecipeMaps.slicerRecipes.getBackend() + .removeRecipes(gtrecipeWorldCache); recipeWorldCache.forEach(r -> { try { - BW_Util.getGTBufferedRecipeList().remove(r); + BW_Util.getGTBufferedRecipeList() + .remove(r); } catch (Exception e) { e.printStackTrace(); } @@ -295,41 +304,43 @@ public class CircuitImprintLoader { } eut = Math.min( - eut, - BW_Util.getMachineVoltageFromTier( - BW_Util.getCircuitTierFromOreDictName( - OreDictionary.getOreName( - OreDictionary.getOreIDs(stack) != null - && OreDictionary.getOreIDs(stack).length > 0 - ? OreDictionary.getOreIDs(stack)[0] - : -1)))); + eut, + BW_Util.getMachineVoltageFromTier( + BW_Util.getCircuitTierFromOreDictName( + OreDictionary.getOreName( + OreDictionary.getOreIDs(stack) != null && OreDictionary.getOreIDs(stack).length > 0 + ? OreDictionary.getOreIDs(stack)[0] + : -1)))); GT_Recipe slicingRecipe = new GT_Recipe( - true, - new ItemStack[] { stack, ItemList.Shape_Slicer_Flat.get(0) }, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStackWithNBT(tag, 1, 1) }, - null, - null, - null, - null, - 300, - eut, - BW_Util.CLEANROOM); + true, + new ItemStack[] { stack, ItemList.Shape_Slicer_Flat.get(0) }, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStackWithNBT(tag, 1, 1) }, + null, + null, + null, + null, + 300, + eut, + BW_Util.CLEANROOM); gtrecipeWorldCache.add(slicingRecipe); RecipeMaps.slicerRecipes.add(slicingRecipe); } private static void makeAndAddCraftingRecipes(NBTTagCompound tag) { - ItemStack circuit = BW_Meta_Items.getNEWCIRCUITS().getStackWithNBT(tag, 0, 1); - Object[] imprintRecipe = { " X ", "GPG", " X ", 'P', BW_Meta_Items.getNEWCIRCUITS().getStackWithNBT(tag, 1, 1), - 'G', WerkstoffLoader.Prasiolite.get(OrePrefixes.gemExquisite, 1), 'X', - BW_Meta_Items.getNEWCIRCUITS().getStack(3) }; + ItemStack circuit = BW_Meta_Items.getNEWCIRCUITS() + .getStackWithNBT(tag, 0, 1); + Object[] imprintRecipe = { " X ", "GPG", " X ", 'P', BW_Meta_Items.getNEWCIRCUITS() + .getStackWithNBT(tag, 1, 1), 'G', WerkstoffLoader.Prasiolite.get(OrePrefixes.gemExquisite, 1), 'X', + BW_Meta_Items.getNEWCIRCUITS() + .getStack(3) }; IRecipe bwrecipe = new BWNBTDependantCraftingRecipe(circuit, imprintRecipe); ShapedOreRecipe gtrecipe = BW_Util.createGTCraftingRecipe( - circuit, - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.KEEPNBT - | GT_ModHandler.RecipeBits.BUFFERED, - imprintRecipe); + circuit, + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.KEEPNBT + | GT_ModHandler.RecipeBits.BUFFERED, + imprintRecipe); // Adds the actual recipe recipeWorldCache.add(bwrecipe); @@ -340,8 +351,8 @@ public class CircuitImprintLoader { } public static NBTTagCompound getTagFromStack(ItemStack stack) { - if (GT_Utility.isStackValid(stack)) - return BW_Util.setStackSize(stack.copy(), 1).writeToNBT(new NBTTagCompound()); + if (GT_Utility.isStackValid(stack)) return BW_Util.setStackSize(stack.copy(), 1) + .writeToNBT(new NBTTagCompound()); return new NBTTagCompound(); } @@ -350,7 +361,8 @@ public class CircuitImprintLoader { } private static void deleteCALRecipesAndTags() { - BartWorksRecipeMaps.circuitAssemblyLineRecipes.getBackend().clearRecipes(); + BartWorksRecipeMaps.circuitAssemblyLineRecipes.getBackend() + .clearRecipes(); recipeTagMap.clear(); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java index 7e1abb7a7a..6db9c63134 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java @@ -116,26 +116,34 @@ public class CircuitPartLoader implements Runnable { @Override public void run() { CircuitPartLoader.makeCircuitParts(); - if (FMLCommonHandler.instance().getEffectiveSide().isClient()) new BW_GT_ItemRenderer(); + if (FMLCommonHandler.instance() + .getEffectiveSide() + .isClient()) new BW_GT_ItemRenderer(); } public static void makeCircuitParts() { ItemList[] itemLists = values(); for (ItemList single : itemLists) { if (!single.hasBeenSet()) continue; - if (single.toString().contains("Wafer") || single.toString().contains("Circuit_Silicon_Ingot") - || single.toString().contains("Raw") - || single.toString().contains("raw") - || single.toString().contains("Glass_Tube") - || single == Circuit_Parts_GlassFiber - || single == Circuit_Parts_Advanced - || single == Circuit_Parts_Wiring_Advanced - || single == Circuit_Parts_Wiring_Elite - || single == Circuit_Parts_Wiring_Basic - || single == Circuit_Integrated - || single == Circuit_Parts_PetriDish - || single == Circuit_Parts_Vacuum_Tube - || single == Circuit_Integrated_Good) { + if (single.toString() + .contains("Wafer") + || single.toString() + .contains("Circuit_Silicon_Ingot") + || single.toString() + .contains("Raw") + || single.toString() + .contains("raw") + || single.toString() + .contains("Glass_Tube") + || single == Circuit_Parts_GlassFiber + || single == Circuit_Parts_Advanced + || single == Circuit_Parts_Wiring_Advanced + || single == Circuit_Parts_Wiring_Elite + || single == Circuit_Parts_Wiring_Basic + || single == Circuit_Integrated + || single == Circuit_Parts_PetriDish + || single == Circuit_Parts_Vacuum_Tube + || single == Circuit_Integrated_Good) { CircuitImprintLoader.blacklistSet.add(single.get(1)); } @@ -146,18 +154,35 @@ public class CircuitPartLoader implements Runnable { ItemStack itemStack = single.get(1); if (!GT_Utility.isStackValid(itemStack)) continue; ArrayList<String> toolTip = new ArrayList<>(); - if (FMLCommonHandler.instance().getEffectiveSide().isClient()) - single.getItem().addInformation(single.get(1).copy(), null, toolTip, true); + if (FMLCommonHandler.instance() + .getEffectiveSide() + .isClient()) + single.getItem() + .addInformation( + single.get(1) + .copy(), + null, + toolTip, + true); String tt = toolTip.size() > 0 ? toolTip.get(0) : ""; // tt += "Internal Name = "+single; String localised = GT_LanguageManager - .getTranslation(GT_LanguageManager.getTranslateableItemStackName(itemStack)); - BW_Meta_Items.getNEWCIRCUITS().addItem(CircuitImprintLoader.reverseIDs, "Wrap of " + localised + "s", tt); + .getTranslation(GT_LanguageManager.getTranslateableItemStackName(itemStack)); + BW_Meta_Items.getNEWCIRCUITS() + .addItem(CircuitImprintLoader.reverseIDs, "Wrap of " + localised + "s", tt); - GT_Values.RA.stdBuilder().itemInputs(single.get(16).copy(), GT_Utility.getIntegratedCircuit(16)) - .itemOutputs(BW_Meta_Items.getNEWCIRCUITS().getStack(CircuitImprintLoader.reverseIDs)) - .fluidInputs(Materials.Plastic.getMolten(72)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + single.get(16) + .copy(), + GT_Utility.getIntegratedCircuit(16)) + .itemOutputs( + BW_Meta_Items.getNEWCIRCUITS() + .getStack(CircuitImprintLoader.reverseIDs)) + .fluidInputs(Materials.Plastic.getMolten(72)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); CircuitImprintLoader.circuitIIconRefs.put(CircuitImprintLoader.reverseIDs, single); CircuitImprintLoader.reverseIDs--; @@ -169,73 +194,73 @@ public class CircuitPartLoader implements Runnable { * this list, to prevent id shift. */ private static final List<ItemList> CIRCUIT_PARTS = Collections.unmodifiableList( - Arrays.asList( - Circuit_Board_Basic, - Circuit_Board_Advanced, - Circuit_Board_Elite, - Circuit_Parts_Crystal_Chip_Elite, - Circuit_Parts_Crystal_Chip_Master, - Circuit_Board_Coated, - Circuit_Board_Coated_Basic, - Circuit_Board_Phenolic, - Circuit_Board_Phenolic_Good, - Circuit_Board_Epoxy, - Circuit_Board_Epoxy_Advanced, - Circuit_Board_Fiberglass, - Circuit_Board_Fiberglass_Advanced, - Circuit_Board_Multifiberglass_Elite, - Circuit_Board_Multifiberglass, - Circuit_Board_Wetware, - Circuit_Board_Wetware_Extreme, - Circuit_Board_Plastic, - Circuit_Board_Plastic_Advanced, - Circuit_Board_Bio, - Circuit_Board_Bio_Ultra, - Circuit_Parts_ResistorSMD, - Circuit_Parts_InductorSMD, - Circuit_Parts_DiodeSMD, - Circuit_Parts_TransistorSMD, - Circuit_Parts_CapacitorSMD, - Circuit_Parts_ResistorASMD, - Circuit_Parts_DiodeASMD, - Circuit_Parts_TransistorASMD, - Circuit_Parts_CapacitorASMD, - Circuit_Chip_ILC, - Circuit_Chip_Ram, - Circuit_Chip_NAND, - Circuit_Chip_NOR, - Circuit_Chip_CPU, - Circuit_Chip_SoC, - Circuit_Chip_SoC2, - Circuit_Chip_PIC, - Circuit_Chip_Simple_SoC, - Circuit_Chip_HPIC, - Circuit_Chip_UHPIC, - Circuit_Chip_ULPIC, - Circuit_Chip_LPIC, - Circuit_Chip_NPIC, - Circuit_Chip_PPIC, - Circuit_Chip_QPIC, - Circuit_Chip_NanoCPU, - Circuit_Chip_QuantumCPU, - Circuit_Chip_CrystalCPU, - Circuit_Chip_CrystalSoC, - Circuit_Chip_CrystalSoC2, - Circuit_Chip_NeuroCPU, - Circuit_Chip_BioCPU, - Circuit_Chip_Stemcell, - Circuit_Chip_Biocell, - Circuit_Parts_ResistorXSMD, - Circuit_Parts_DiodeXSMD, - Circuit_Parts_TransistorXSMD, - Circuit_Parts_CapacitorXSMD, - Circuit_Parts_InductorASMD, - Circuit_Parts_InductorXSMD, - Circuit_Chip_Optical, - Circuit_Board_Optical, - Optically_Perfected_CPU, - Optical_Cpu_Containment_Housing, - Optically_Compatible_Memory, - Circuit_Parts_Crystal_Chip_Wetware, - Circuit_Parts_Chip_Bioware)); + Arrays.asList( + Circuit_Board_Basic, + Circuit_Board_Advanced, + Circuit_Board_Elite, + Circuit_Parts_Crystal_Chip_Elite, + Circuit_Parts_Crystal_Chip_Master, + Circuit_Board_Coated, + Circuit_Board_Coated_Basic, + Circuit_Board_Phenolic, + Circuit_Board_Phenolic_Good, + Circuit_Board_Epoxy, + Circuit_Board_Epoxy_Advanced, + Circuit_Board_Fiberglass, + Circuit_Board_Fiberglass_Advanced, + Circuit_Board_Multifiberglass_Elite, + Circuit_Board_Multifiberglass, + Circuit_Board_Wetware, + Circuit_Board_Wetware_Extreme, + Circuit_Board_Plastic, + Circuit_Board_Plastic_Advanced, + Circuit_Board_Bio, + Circuit_Board_Bio_Ultra, + Circuit_Parts_ResistorSMD, + Circuit_Parts_InductorSMD, + Circuit_Parts_DiodeSMD, + Circuit_Parts_TransistorSMD, + Circuit_Parts_CapacitorSMD, + Circuit_Parts_ResistorASMD, + Circuit_Parts_DiodeASMD, + Circuit_Parts_TransistorASMD, + Circuit_Parts_CapacitorASMD, + Circuit_Chip_ILC, + Circuit_Chip_Ram, + Circuit_Chip_NAND, + Circuit_Chip_NOR, + Circuit_Chip_CPU, + Circuit_Chip_SoC, + Circuit_Chip_SoC2, + Circuit_Chip_PIC, + Circuit_Chip_Simple_SoC, + Circuit_Chip_HPIC, + Circuit_Chip_UHPIC, + Circuit_Chip_ULPIC, + Circuit_Chip_LPIC, + Circuit_Chip_NPIC, + Circuit_Chip_PPIC, + Circuit_Chip_QPIC, + Circuit_Chip_NanoCPU, + Circuit_Chip_QuantumCPU, + Circuit_Chip_CrystalCPU, + Circuit_Chip_CrystalSoC, + Circuit_Chip_CrystalSoC2, + Circuit_Chip_NeuroCPU, + Circuit_Chip_BioCPU, + Circuit_Chip_Stemcell, + Circuit_Chip_Biocell, + Circuit_Parts_ResistorXSMD, + Circuit_Parts_DiodeXSMD, + Circuit_Parts_TransistorXSMD, + Circuit_Parts_CapacitorXSMD, + Circuit_Parts_InductorASMD, + Circuit_Parts_InductorXSMD, + Circuit_Chip_Optical, + Circuit_Board_Optical, + Optically_Perfected_CPU, + Optical_Cpu_Containment_Housing, + Optically_Compatible_Memory, + Circuit_Parts_Crystal_Chip_Wetware, + Circuit_Parts_Chip_Bioware)); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java index 08b3968251..91dc709609 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/BWGTMetaItems.java @@ -58,8 +58,8 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items { ItemStack tStack = new ItemStack(this, 1, i); Materials material = Materials.values()[i]; if (material.getMolten(1) == null && orePrefixes == OrePrefixes.capsuleMolten - || material.getFluid(1) == null && material.getGas(1) == null - && (orePrefixes == OrePrefixes.capsule || orePrefixes == OrePrefixes.bottle)) + || material.getFluid(1) == null && material.getGas(1) == null + && (orePrefixes == OrePrefixes.capsule || orePrefixes == OrePrefixes.bottle)) continue; if (OreDictionary.doesOreNameExist(this.orePrefixes.name() + material.mDefaultLocalName.replace(" ", ""))) { @@ -67,7 +67,7 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items { continue; } GT_OreDictUnificator - .registerOre(this.orePrefixes.name() + material.mDefaultLocalName.replace(" ", ""), tStack); + .registerOre(this.orePrefixes.name() + material.mDefaultLocalName.replace(" ", ""), tStack); } if (noSubIDMaterials != null) { @@ -77,8 +77,8 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items { ItemStack tStack = new ItemStack(this, 1, i + 1001); Materials w = noSubIDMaterials.get(i); if (w.getMolten(1) == null && orePrefixes == OrePrefixes.capsuleMolten - || w.getFluid(1) == null && w.getGas(1) == null - && (orePrefixes == OrePrefixes.capsule || orePrefixes == OrePrefixes.bottle)) + || w.getFluid(1) == null && w.getGas(1) == null + && (orePrefixes == OrePrefixes.capsule || orePrefixes == OrePrefixes.bottle)) continue; if (OreDictionary.doesOreNameExist(this.orePrefixes.name() + w.mDefaultLocalName.replace(" ", ""))) { @@ -86,7 +86,7 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items { continue; } GT_OreDictUnificator - .registerOre(this.orePrefixes.name() + w.mDefaultLocalName.replace(" ", ""), tStack); + .registerOre(this.orePrefixes.name() + w.mDefaultLocalName.replace(" ", ""), tStack); } } } @@ -167,11 +167,10 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items { for (int i = 0; i < Materials.values().length; i++) { Materials w = Materials.values()[i]; if (w == null || (w.mTypes & Werkstoff.GenerationFeatures.getPrefixDataRaw(this.orePrefixes)) == 0 - && Werkstoff.GenerationFeatures.getPrefixDataRaw(this.orePrefixes) != 0) - continue; + && Werkstoff.GenerationFeatures.getPrefixDataRaw(this.orePrefixes) != 0) continue; if (w.getMolten(1) == null && this.orePrefixes == OrePrefixes.capsuleMolten - || w.getFluid(1) == null && w.getGas(1) == null - && (this.orePrefixes == OrePrefixes.capsule || this.orePrefixes == OrePrefixes.bottle)) + || w.getFluid(1) == null && w.getGas(1) == null + && (this.orePrefixes == OrePrefixes.capsule || this.orePrefixes == OrePrefixes.bottle)) continue; else if (this.hiddenThings.contains(i)) continue; aList.add(new ItemStack(this, 1, i)); @@ -179,11 +178,10 @@ public class BWGTMetaItems extends BW_MetaGenerated_Items { if (this.hasList) for (int i = 0; i < NoMetaValue.size(); i++) { Materials w = NoMetaValue.get(i); if (w == null || (w.mTypes & Werkstoff.GenerationFeatures.getPrefixDataRaw(this.orePrefixes)) == 0 - && Werkstoff.GenerationFeatures.getPrefixDataRaw(this.orePrefixes) != 0) - continue; + && Werkstoff.GenerationFeatures.getPrefixDataRaw(this.orePrefixes) != 0) continue; if (w.getMolten(1) == null && this.orePrefixes == OrePrefixes.capsuleMolten - || w.getFluid(1) == null && w.getGas(1) == null - && (this.orePrefixes == OrePrefixes.capsule || this.orePrefixes == OrePrefixes.bottle)) + || w.getFluid(1) == null && w.getGas(1) == null + && (this.orePrefixes == OrePrefixes.capsule || this.orePrefixes == OrePrefixes.bottle)) continue; else if (this.hiddenThings.contains(i)) continue; aList.add(new ItemStack(this, 1, i + 1001)); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java index 43a5a3dac3..5b475dc069 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/GTMetaItemEnhancer.java @@ -44,8 +44,11 @@ public class GTMetaItemEnhancer { if (!Forestry.isModLoaded()) { return; } - NoMetaValue = Materials.getMaterialsMap().values().stream().filter(m -> m.mMetaItemSubID == -1) - .collect(Collectors.toList()); + NoMetaValue = Materials.getMaterialsMap() + .values() + .stream() + .filter(m -> m.mMetaItemSubID == -1) + .collect(Collectors.toList()); Item moltenCapsuls = new BWGTMetaItems(OrePrefixes.capsuleMolten, null); Item capsuls = new BWGTMetaItems(OrePrefixes.capsule, NoMetaValue); // Item bottles = new BWGTMetaItems(OrePrefixes.bottle, NoMetaValue); @@ -55,18 +58,26 @@ public class GTMetaItemEnhancer { Materials m = values[i]; if (m.mStandardMoltenFluid != null && GT_OreDictUnificator.get(OrePrefixes.cellMolten, m, 1) != null) { final FluidContainerRegistry.FluidContainerData emptyData = new FluidContainerRegistry.FluidContainerData( - m.getMolten(144), - new ItemStack(moltenCapsuls, 1, i), - GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1)); + m.getMolten(144), + new ItemStack(moltenCapsuls, 1, i), + GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1)); FluidContainerRegistry.registerFluidContainer(emptyData); GT_Utility.addFluidContainerData(emptyData); - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1)) - .itemOutputs(new ItemStack(moltenCapsuls, 1, i)).fluidInputs(m.getMolten(144)) - .duration(2 * TICKS).eut(2).addTo(fluidCannerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(moltenCapsuls, 1, i)).fluidOutputs(m.getMolten(144)) - .duration(2 * TICKS).eut(2).addTo(fluidCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1)) + .itemOutputs(new ItemStack(moltenCapsuls, 1, i)) + .fluidInputs(m.getMolten(144)) + .duration(2 * TICKS) + .eut(2) + .addTo(fluidCannerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(moltenCapsuls, 1, i)) + .fluidOutputs(m.getMolten(144)) + .duration(2 * TICKS) + .eut(2) + .addTo(fluidCannerRecipes); } if (m.getFluid(1) == null && m.getGas(1) == null || OreDictionary.doesOreNameExist("capsule" + m.mName)) @@ -84,19 +95,31 @@ public class GTMetaItemEnhancer { } private static void addFluidData(Materials m, ItemStack container, Item filled, int amount, int it, boolean empty) { - Fluid f = m.getFluid(1) != null ? m.getFluid(1).getFluid() : m.getGas(1).getFluid(); + Fluid f = m.getFluid(1) != null ? m.getFluid(1) + .getFluid() + : m.getGas(1) + .getFluid(); final FluidContainerRegistry.FluidContainerData emptyData = new FluidContainerRegistry.FluidContainerData( - new FluidStack(f, amount), - new ItemStack(filled, 1, it), - container); + new FluidStack(f, amount), + new ItemStack(filled, 1, it), + container); FluidContainerRegistry.registerFluidContainer(emptyData); GT_Utility.addFluidContainerData(emptyData); - GT_Values.RA.stdBuilder().itemInputs(container).itemOutputs(new ItemStack(filled, 1, it)) - .fluidInputs(new FluidStack(f, amount)).duration(amount / 62).eut(2).addTo(fluidCannerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(filled, 1, it)).fluidOutputs(new FluidStack(f, amount)) - .duration(amount / 62).eut(2).addTo(fluidCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(container) + .itemOutputs(new ItemStack(filled, 1, it)) + .fluidInputs(new FluidStack(f, amount)) + .duration(amount / 62) + .eut(2) + .addTo(fluidCannerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(filled, 1, it)) + .fluidOutputs(new FluidStack(f, amount)) + .duration(amount / 62) + .eut(2) + .addTo(fluidCannerRecipes); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java index 5db1bcdf56..ba08d083c2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java @@ -135,11 +135,10 @@ import gregtech.common.blocks.GT_Block_Ores_Abstract; public class PlatinumSludgeOverHaul { private static final Materials[] BLACKLIST = { Materials.HSSS, Materials.EnderiumBase, Materials.Osmiridium, - Materials.TPV, Materials.get("Uraniumtriplatinid"), - Materials.get("Tetranaquadahdiindiumhexaplatiumosminid"), - Materials.get("Longasssuperconductornameforuvwire"), }; + Materials.TPV, Materials.get("Uraniumtriplatinid"), Materials.get("Tetranaquadahdiindiumhexaplatiumosminid"), + Materials.get("Longasssuperconductornameforuvwire"), }; private static final OrePrefixes[] OPBLACKLIST = { crushedCentrifuged, crushed, crushedPurified, dustPure, - dustImpure, dustRefined, dust, dustTiny, dustSmall }; + dustImpure, dustRefined, dust, dustTiny, dustSmall }; private PlatinumSludgeOverHaul() {} @@ -147,400 +146,579 @@ public class PlatinumSludgeOverHaul { // DilutedSulfuricAcid // 2H2SO4 + H2O = 3H2SO4(d) GT_Values.RA.stdBuilder() - .itemInputs( - Materials.SulfuricAcid.getCells(2), - Materials.Water.getCells(1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.DilutedSulfuricAcid.getCells(3)).duration(1 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(mixerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.SulfuricAcid.getFluid(2000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(3000)).duration(1 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(mixerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfuricAcid.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(2)).fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(3000)).duration(1 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(mixerRecipes); + .itemInputs( + Materials.SulfuricAcid.getCells(2), + Materials.Water.getCells(1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.DilutedSulfuricAcid.getCells(3)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(mixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(2000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(3000)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(mixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfuricAcid.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(2)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(3000)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(mixerRecipes); // FormicAcid // CO + NaOH = CHO2Na - GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonMonoxide.getCells(1), Materials.SodiumHydroxide.getDust(3)) - .itemOutputs(Sodiumformate.get(cell)).duration(15 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CarbonMonoxide.getCells(1), Materials.SodiumHydroxide.getDust(3)) + .itemOutputs(Sodiumformate.get(cell)) + .duration(15 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // H2SO4 + 2CHO2Na = 2CH2O2 + Na2SO4 - GT_Values.RA.stdBuilder().itemInputs(Sodiumformate.get(cell, 2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(FormicAcid.get(cell, 2), Sodiumsulfate.get(dust, 7)) - .fluidInputs(Materials.SulfuricAcid.getFluid(1000)).duration(15 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Sodiumformate.get(cell, 2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(FormicAcid.get(cell, 2), Sodiumsulfate.get(dust, 7)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .duration(15 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1), Sodiumsulfate.get(dust, 7)) - .fluidInputs(Sodiumformate.getFluidOrGas(2000)).fluidOutputs(FormicAcid.getFluidOrGas(2000)) - .duration(15 * TICKS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1), Sodiumsulfate.get(dust, 7)) + .fluidInputs(Sodiumformate.getFluidOrGas(2000)) + .fluidOutputs(FormicAcid.getFluidOrGas(2000)) + .duration(15 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // AquaRegia GT_Values.RA.stdBuilder() - .itemInputs( - Materials.DilutedSulfuricAcid.getCells(1), - Materials.NitricAcid.getCells(1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(AquaRegia.get(cell, 2)).duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(mixerRecipes); + .itemInputs( + Materials.DilutedSulfuricAcid.getCells(1), + Materials.NitricAcid.getCells(1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(AquaRegia.get(cell, 2)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.DilutedSulfuricAcid.getCells(1), - Materials.NitricAcid.getCells(1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(2)).fluidOutputs(AquaRegia.getFluidOrGas(2000)) - .duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(mixerRecipes); + .itemInputs( + Materials.DilutedSulfuricAcid.getCells(1), + Materials.NitricAcid.getCells(1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(2)) + .fluidOutputs(AquaRegia.getFluidOrGas(2000)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(mixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.NitricAcid.getCells(1), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.DilutedSulfuricAcid.getFluid(1000)) - .fluidOutputs(AquaRegia.getFluidOrGas(2000)).duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(mixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitricAcid.getCells(1), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .fluidOutputs(AquaRegia.getFluidOrGas(2000)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(mixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(Materials.DilutedSulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.NitricAcid.getFluid(1000)) - .fluidOutputs(AquaRegia.getFluidOrGas(2000)).duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(mixerRecipes); + .itemInputs(Materials.DilutedSulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.NitricAcid.getFluid(1000)) + .fluidOutputs(AquaRegia.getFluidOrGas(2000)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(mixerRecipes); // AmmoniumChloride // NH3 + HCl = NH4Cl - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(AmmoniumChloride.get(cell, 1)).fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .duration(15 * TICKS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(AmmoniumChloride.get(cell, 1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(15 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Ammonia.getGas(1000)) - .fluidOutputs(AmmoniumChloride.getFluidOrGas(1000)).duration(15 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Ammonia.getGas(1000)) + .fluidOutputs(AmmoniumChloride.getFluidOrGas(1000)) + .duration(15 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, - new FluidStack[] { Materials.Ammonia.getGas(64000), Materials.HydrochloricAcid.getFluid(64000) }, - new FluidStack[] { AmmoniumChloride.getFluidOrGas(64000) }, - null, - 60, - 480); + new ItemStack[] { GT_Utility.getIntegratedCircuit(9) }, + new FluidStack[] { Materials.Ammonia.getGas(64000), Materials.HydrochloricAcid.getFluid(64000) }, + new FluidStack[] { AmmoniumChloride.getFluidOrGas(64000) }, + null, + 60, + 480); // base solution for (Werkstoff w : Werkstoff.werkstoffHashSet) if (w.containsStuff(Materials.Sulfur) - && (w.containsStuff(Materials.Copper) || w.containsStuff(Materials.Nickel))) { + && (w.containsStuff(Materials.Copper) || w.containsStuff(Materials.Nickel))) { + + GT_Values.RA.stdBuilder() + .itemInputs(w.get(crushedPurified), GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(AquaRegia.getFluidOrGas(150)) + .fluidOutputs(PTConcentrate.getFluidOrGas(150)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(w.get(crushedPurified, 9), GT_Utility.getIntegratedCircuit(9)) + .fluidInputs(AquaRegia.getFluidOrGas(1350)) + .fluidOutputs(PTConcentrate.getFluidOrGas(1350)) + .duration(11 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(w.get(crushedPurified, 9), PTMetallicPowder.get(dust, 9)) + .itemOutputs(PTResidue.get(dust)) + .fluidInputs(AquaRegia.getFluidOrGas(10350)) + .fluidOutputs(PTConcentrate.getFluidOrGas(10350)) + .duration(1 * MINUTES + 52 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(w.get(crushedPurified), GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(AquaRegia.getFluidOrGas(150)).fluidOutputs(PTConcentrate.getFluidOrGas(150)) - .duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + } + for (Materials m : Materials.values()) if (PlatinumSludgeOverHaul.materialsContains(m, Materials.Sulfur) + && (PlatinumSludgeOverHaul.materialsContains(m, Materials.Copper) + || PlatinumSludgeOverHaul.materialsContains(m, Materials.Nickel))) { + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(crushedPurified, m, 1), GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(AquaRegia.getFluidOrGas(150)) + .fluidOutputs(PTConcentrate.getFluidOrGas(150)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(crushedPurified, m, 9), GT_Utility.getIntegratedCircuit(9)) + .fluidInputs(AquaRegia.getFluidOrGas(1350)) + .fluidOutputs(PTConcentrate.getFluidOrGas(1350)) + .duration(1 * MINUTES + 52 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(crushedPurified, m, 9), PTMetallicPowder.get(dust, 9)) + .itemOutputs(PTResidue.get(dust)) + .fluidInputs(AquaRegia.getFluidOrGas(10350)) + .fluidOutputs(PTConcentrate.getFluidOrGas(10350)) + .duration(1 * MINUTES + 52 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(w.get(crushedPurified, 9), GT_Utility.getIntegratedCircuit(9)) - .fluidInputs(AquaRegia.getFluidOrGas(1350)).fluidOutputs(PTConcentrate.getFluidOrGas(1350)) - .duration(11 * SECONDS + 5 * TICKS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + } + // Pt + GT_Values.RA.stdBuilder() + .itemInputs(PTMetallicPowder.get(dust, 3), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Platinum.getNuggets(2)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .metadata(COIL_HEAT, Materials.Platinum.mMeltingPoint) + .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder().itemInputs(w.get(crushedPurified, 9), PTMetallicPowder.get(dust, 9)) - .itemOutputs(PTResidue.get(dust)).fluidInputs(AquaRegia.getFluidOrGas(10350)) - .fluidOutputs(PTConcentrate.getFluidOrGas(10350)) - .duration(1 * MINUTES + 52 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(PTMetallicPowder.get(dust), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(PTResidue.get(dustTiny)) + .fluidInputs(AquaRegia.getFluidOrGas(1000)) + .fluidOutputs(PTConcentrate.getFluidOrGas(1000)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - } - for (Materials m : Materials.values()) if (PlatinumSludgeOverHaul.materialsContains(m, Materials.Sulfur) - && (PlatinumSludgeOverHaul.materialsContains(m, Materials.Copper) - || PlatinumSludgeOverHaul.materialsContains(m, Materials.Nickel))) { - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(crushedPurified, m, 1), - GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(AquaRegia.getFluidOrGas(150)) - .fluidOutputs(PTConcentrate.getFluidOrGas(150)).duration(12 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(crushedPurified, m, 9), - GT_Utility.getIntegratedCircuit(9)) - .fluidInputs(AquaRegia.getFluidOrGas(1350)) - .fluidOutputs(PTConcentrate.getFluidOrGas(1350)) - .duration(1 * MINUTES + 52 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(crushedPurified, m, 9), - PTMetallicPowder.get(dust, 9)) - .itemOutputs(PTResidue.get(dust)).fluidInputs(AquaRegia.getFluidOrGas(10350)) - .fluidOutputs(PTConcentrate.getFluidOrGas(10350)) - .duration(1 * MINUTES + 52 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(PTMetallicPowder.get(dust, 9), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(PTResidue.get(dust)) + .fluidInputs(AquaRegia.getFluidOrGas(9000)) + .fluidOutputs(PTConcentrate.getFluidOrGas(9000)) + .duration(1 * MINUTES + 52 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - } - // Pt - GT_Values.RA.stdBuilder().itemInputs(PTMetallicPowder.get(dust, 3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Platinum.getNuggets(2)).duration(30 * SECONDS).eut(TierEU.RECIPE_MV) - .metadata(COIL_HEAT, Materials.Platinum.mMeltingPoint).addTo(blastFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(PTMetallicPowder.get(dust), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(PTResidue.get(dustTiny)).fluidInputs(AquaRegia.getFluidOrGas(1000)) - .fluidOutputs(PTConcentrate.getFluidOrGas(1000)).duration(12 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(PTMetallicPowder.get(dust, 9), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(PTResidue.get(dust)).fluidInputs(AquaRegia.getFluidOrGas(9000)) - .fluidOutputs(PTConcentrate.getFluidOrGas(9000)).duration(1 * MINUTES + 52 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(PTConcentrate.get(cell, 2)) - .itemOutputs( - PTSaltCrude.get(dustTiny, 16), - PTRawPowder.get(dustTiny, 4), - Materials.NitrogenDioxide.getCells(1), - Materials.DilutedSulfuricAcid.getCells(1)) - .fluidInputs(AmmoniumChloride.getFluidOrGas(400)).fluidOutputs(PDAmmonia.getFluidOrGas(400)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(centrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(PTConcentrate.get(cell, 2)) + .itemOutputs( + PTSaltCrude.get(dustTiny, 16), + PTRawPowder.get(dustTiny, 4), + Materials.NitrogenDioxide.getCells(1), + Materials.DilutedSulfuricAcid.getCells(1)) + .fluidInputs(AmmoniumChloride.getFluidOrGas(400)) + .fluidOutputs(PDAmmonia.getFluidOrGas(400)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(centrifugeRecipes); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, - new FluidStack[] { PTConcentrate.getFluidOrGas(2000), AmmoniumChloride.getFluidOrGas(400) }, - new FluidStack[] { PDAmmonia.getFluidOrGas(400), Materials.NitrogenDioxide.getGas(1000), - Materials.DilutedSulfuricAcid.getFluid(1000) }, - new ItemStack[] { PTSaltCrude.get(dustTiny, 16), PTRawPowder.get(dustTiny, 4) }, - 1200, - 30); + new ItemStack[] { GT_Utility.getIntegratedCircuit(1) }, + new FluidStack[] { PTConcentrate.getFluidOrGas(2000), AmmoniumChloride.getFluidOrGas(400) }, + new FluidStack[] { PDAmmonia.getFluidOrGas(400), Materials.NitrogenDioxide.getGas(1000), + Materials.DilutedSulfuricAcid.getFluid(1000) }, + new ItemStack[] { PTSaltCrude.get(dustTiny, 16), PTRawPowder.get(dustTiny, 4) }, + 1200, + 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, - new FluidStack[] { PTConcentrate.getFluidOrGas(18000), AmmoniumChloride.getFluidOrGas(3600) }, - new FluidStack[] { PDAmmonia.getFluidOrGas(3600), Materials.NitrogenDioxide.getGas(9000), - Materials.DilutedSulfuricAcid.getFluid(9000) }, - new ItemStack[] { PTSaltCrude.get(dust, 16), PTRawPowder.get(dust, 4) }, - 1400, - 240); - - GT_Values.RA.stdBuilder().itemInputs(PTSaltCrude.get(dust)) - .itemOutputs( - PTSaltRefined.get(dust), - PTSaltRefined.get(dust), - PTSaltRefined.get(dust), - PTSaltRefined.get(dust), - PTSaltRefined.get(dust), - PTSaltRefined.get(dust), - PTSaltRefined.get(dust), - PTSaltRefined.get(dust), - PTSaltRefined.get(dust)) - .outputChances(1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1500).duration(30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sifterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(PTSaltRefined.get(dust), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(PTMetallicPowder.get(dust)).fluidOutputs(Materials.Chlorine.getGas(87)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 900).addTo(blastFurnaceRecipes); + new ItemStack[] { GT_Utility.getIntegratedCircuit(2) }, + new FluidStack[] { PTConcentrate.getFluidOrGas(18000), AmmoniumChloride.getFluidOrGas(3600) }, + new FluidStack[] { PDAmmonia.getFluidOrGas(3600), Materials.NitrogenDioxide.getGas(9000), + Materials.DilutedSulfuricAcid.getFluid(9000) }, + new ItemStack[] { PTSaltCrude.get(dust, 16), PTRawPowder.get(dust, 4) }, + 1400, + 240); + + GT_Values.RA.stdBuilder() + .itemInputs(PTSaltCrude.get(dust)) + .itemOutputs( + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust), + PTSaltRefined.get(dust)) + .outputChances(1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1500) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sifterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(PTSaltRefined.get(dust), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(PTMetallicPowder.get(dust)) + .fluidOutputs(Materials.Chlorine.getGas(87)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 900) + .addTo(blastFurnaceRecipes); // 2PtCl + Ca = 2Pt + CaCl2 - GT_Values.RA.stdBuilder().itemInputs(PTRawPowder.get(dust, 4), Materials.Calcium.getDust(1)) - .itemOutputs(Materials.Platinum.getDust(2), CalciumChloride.get(dust, 3)) - .duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(PTRawPowder.get(dust, 4), Materials.Calcium.getDust(1)) + .itemOutputs(Materials.Platinum.getDust(2), CalciumChloride.get(dust, 3)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Pd - GT_Values.RA.stdBuilder().itemInputs(PDMetallicPowder.get(dust), GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(Materials.Ammonia.getGas(1000)).fluidOutputs(PDAmmonia.getFluidOrGas(1000)) - .duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(PDMetallicPowder.get(dust), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(PDSalt.get(dustTiny, 16), PDRawPowder.get(dustTiny, 2)) - .fluidInputs(PDAmmonia.getFluidOrGas(1000)).duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(PDMetallicPowder.get(dust, 9), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(PDSalt.get(dust, 16), PDRawPowder.get(dust, 2)).fluidInputs(PDAmmonia.getFluidOrGas(9000)) - .duration(1 * MINUTES + 52 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).itemOutputs(PDSalt.get(dust)) - .fluidInputs(PDAmmonia.getFluidOrGas(1000)).duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(PDSalt.get(dust)) - .itemOutputs( - PDMetallicPowder.get(dust), - PDMetallicPowder.get(dust), - PDMetallicPowder.get(dust), - PDMetallicPowder.get(dust), - PDMetallicPowder.get(dust), - PDMetallicPowder.get(dust), - PDMetallicPowder.get(dust), - PDMetallicPowder.get(dust), - PDMetallicPowder.get(dust)) - .outputChances(1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1500).duration(30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sifterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(PDMetallicPowder.get(dust), GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(Materials.Ammonia.getGas(1000)) + .fluidOutputs(PDAmmonia.getFluidOrGas(1000)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(PDMetallicPowder.get(dust), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(PDSalt.get(dustTiny, 16), PDRawPowder.get(dustTiny, 2)) + .fluidInputs(PDAmmonia.getFluidOrGas(1000)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(PDMetallicPowder.get(dust, 9), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(PDSalt.get(dust, 16), PDRawPowder.get(dust, 2)) + .fluidInputs(PDAmmonia.getFluidOrGas(9000)) + .duration(1 * MINUTES + 52 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(PDSalt.get(dust)) + .fluidInputs(PDAmmonia.getFluidOrGas(1000)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(PDSalt.get(dust)) + .itemOutputs( + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust), + PDMetallicPowder.get(dust)) + .outputChances(1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1500) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sifterRecipes); GT_Values.RA.addChemicalRecipeForBasicMachineOnly( - PDRawPowder.get(dust, 4), - Materials.Empty.getCells(1), - FormicAcid.getFluidOrGas(4000), - Materials.Ammonia.getGas(4000), - Materials.Palladium.getDust(2), - Materials.Ethylene.getCells(1), - 250, - 30); + PDRawPowder.get(dust, 4), + Materials.Empty.getCells(1), + FormicAcid.getFluidOrGas(4000), + Materials.Ammonia.getGas(4000), + Materials.Palladium.getDust(2), + Materials.Ethylene.getCells(1), + 250, + 30); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { PDRawPowder.get(dust, 4) }, - new FluidStack[] { FormicAcid.getFluidOrGas(4000) }, - new FluidStack[] { Materials.Ammonia.getGas(4000), Materials.Ethylene.getGas(1000), - Materials.Water.getFluid(1000) }, - new ItemStack[] { Materials.Palladium.getDust(2) }, - 250, - 30); + new ItemStack[] { PDRawPowder.get(dust, 4) }, + new FluidStack[] { FormicAcid.getFluidOrGas(4000) }, + new FluidStack[] { Materials.Ammonia.getGas(4000), Materials.Ethylene.getGas(1000), + Materials.Water.getFluid(1000) }, + new ItemStack[] { Materials.Palladium.getDust(2) }, + 250, + 30); // Na2SO4 + 2H = 2Na + H2SO4 - GT_Values.RA.stdBuilder().itemInputs(Sodiumsulfate.get(dust, 7), Materials.Hydrogen.getCells(2)) - .itemOutputs(Materials.Sodium.getDust(2), Materials.Empty.getCells(2)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)).duration(1 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Sodiumsulfate.get(dust, 7), Materials.Hydrogen.getCells(2)) + .itemOutputs(Materials.Sodium.getDust(2), Materials.Empty.getCells(2)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // K2S2O7 // GT_Values.RA.addChemicalRecipe(Sodiumsulfate.get(dust), Materials.Potassium.getDust(2), // Materials.Oxygen.getGas(3000), null, PotassiumDisulfate.get(dust,6), null, 30); // Rh/Os/Ir/Ru - GT_Values.RA.stdBuilder().itemInputs(PTResidue.get(dust), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(LeachResidue.get(dust)).fluidInputs(PotassiumDisulfate.getMolten(360)) - .fluidOutputs(RHSulfate.getFluidOrGas(360)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 775).addTo(blastFurnaceRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(PTResidue.get(dust), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(LeachResidue.get(dust)) + .fluidInputs(PotassiumDisulfate.getMolten(360)) + .fluidOutputs(RHSulfate.getFluidOrGas(360)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 775) + .addTo(blastFurnaceRecipes); // Ru - GT_Values.RA.stdBuilder().itemInputs(LeachResidue.get(dust, 10), Materials.Saltpeter.getDust(10)) - .itemOutputs(SodiumRuthenate.get(dust, 3), IrOsLeachResidue.get(dust, 6)) - .fluidInputs(Materials.SaltWater.getFluid(1000)).fluidOutputs(GT_ModHandler.getSteam(1000)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 775).addTo(blastFurnaceRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(LeachResidue.get(dust, 10), Materials.Saltpeter.getDust(10)) + .itemOutputs(SodiumRuthenate.get(dust, 3), IrOsLeachResidue.get(dust, 6)) + .fluidInputs(Materials.SaltWater.getFluid(1000)) + .fluidOutputs(GT_ModHandler.getSteam(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 775) + .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder().itemInputs(SodiumRuthenate.get(dust, 6), Materials.Chlorine.getCells(3)) - .itemOutputs(Materials.Empty.getCells(3)).fluidOutputs(RutheniumTetroxideSollution.getFluidOrGas(9000)) - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(SodiumRuthenate.get(dust, 6), Materials.Chlorine.getCells(3)) + .itemOutputs(Materials.Empty.getCells(3)) + .fluidOutputs(RutheniumTetroxideSollution.getFluidOrGas(9000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(RutheniumTetroxideSollution.getFluidOrGas(800)) - .fluidOutputs(HotRutheniumTetroxideSollution.getFluidOrGas(800)).duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(fluidHeaterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(RutheniumTetroxideSollution.getFluidOrGas(800)) + .fluidOutputs(HotRutheniumTetroxideSollution.getFluidOrGas(800)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(fluidHeaterRecipes); GT_Values.RA.addCrackingRecipe( - 17, - RutheniumTetroxideSollution.getFluidOrGas(1000), - GT_ModHandler.getSteam(1000), - HotRutheniumTetroxideSollution.getFluidOrGas(2000), - 150, - 480); + 17, + RutheniumTetroxideSollution.getFluidOrGas(1000), + GT_ModHandler.getSteam(1000), + HotRutheniumTetroxideSollution.getFluidOrGas(2000), + 150, + 480); GT_Values.RA.addDistillationTowerRecipe( - HotRutheniumTetroxideSollution.getFluidOrGas(9000), - new FluidStack[] { Materials.Water.getFluid(1800), RutheniumTetroxide.getFluidOrGas(7200) }, - Materials.Salt.getDust(6), - 1500, - 480); + HotRutheniumTetroxideSollution.getFluidOrGas(9000), + new FluidStack[] { Materials.Water.getFluid(1800), RutheniumTetroxide.getFluidOrGas(7200) }, + Materials.Salt.getDust(6), + 1500, + 480); - GT_Values.RA.stdBuilder().itemInputs(RutheniumTetroxide.get(dust, 1), Materials.HydrochloricAcid.getCells(6)) - .itemOutputs(Ruthenium.get(dust), Materials.Chlorine.getCells(6)) - .fluidOutputs(Materials.Water.getFluid(2000)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(RutheniumTetroxide.get(dust, 1), Materials.HydrochloricAcid.getCells(6)) + .itemOutputs(Ruthenium.get(dust), Materials.Chlorine.getCells(6)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Os - GT_Values.RA.stdBuilder().itemInputs(IrOsLeachResidue.get(dust, 4), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(IrLeachResidue.get(dust, 2)).fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(AcidicOsmiumSolution.getFluidOrGas(2000)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 775).addTo(blastFurnaceRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(IrOsLeachResidue.get(dust, 4), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(IrLeachResidue.get(dust, 2)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(AcidicOsmiumSolution.getFluidOrGas(2000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 775) + .addTo(blastFurnaceRecipes); GT_Values.RA.addDistillationTowerRecipe( - AcidicOsmiumSolution.getFluidOrGas(1000), - new FluidStack[] { OsmiumSolution.getFluidOrGas(100), Materials.Water.getFluid(900) }, - null, - 150, - (int) TierEU.RECIPE_IV); + AcidicOsmiumSolution.getFluidOrGas(1000), + new FluidStack[] { OsmiumSolution.getFluidOrGas(100), Materials.Water.getFluid(900) }, + null, + 150, + (int) TierEU.RECIPE_IV); - GT_Values.RA.stdBuilder().itemInputs(OsmiumSolution.get(cell), Materials.HydrochloricAcid.getCells(6)) - .itemOutputs(Materials.Osmium.getDust(1), Materials.Chlorine.getCells(7)) - .fluidOutputs(Materials.Water.getFluid(2000)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(OsmiumSolution.get(cell), Materials.HydrochloricAcid.getCells(6)) + .itemOutputs(Materials.Osmium.getDust(1), Materials.Chlorine.getCells(7)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Ir - GT_Values.RA.stdBuilder().itemInputs(IrLeachResidue.get(dust), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(PGSDResidue.get(dust), IridiumDioxide.get(dust)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 775).addTo(blastFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(IridiumDioxide.get(dust), Materials.HydrochloricAcid.getCells(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidOutputs(AcidicIridiumSolution.getFluidOrGas(1000)) - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(AcidicIridiumSolution.get(cell), AmmoniumChloride.get(cell, 3)) - .itemOutputs(Materials.Empty.getCells(4), IridiumChloride.get(dust)) - .fluidOutputs(Materials.Ammonia.getGas(3000)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(IridiumChloride.get(dust), Materials.Calcium.getDust(1)) - .itemOutputs(PGSDResidue2.get(dust), Materials.Iridium.getDust(1)) - .fluidOutputs(CalciumChloride.getFluidOrGas(3000)).duration(15 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(IrLeachResidue.get(dust), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(PGSDResidue.get(dust), IridiumDioxide.get(dust)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 775) + .addTo(blastFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(IridiumDioxide.get(dust), Materials.HydrochloricAcid.getCells(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidOutputs(AcidicIridiumSolution.getFluidOrGas(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(AcidicIridiumSolution.get(cell), AmmoniumChloride.get(cell, 3)) + .itemOutputs(Materials.Empty.getCells(4), IridiumChloride.get(dust)) + .fluidOutputs(Materials.Ammonia.getGas(3000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(IridiumChloride.get(dust), Materials.Calcium.getDust(1)) + .itemOutputs(PGSDResidue2.get(dust), Materials.Iridium.getDust(1)) + .fluidOutputs(CalciumChloride.getFluidOrGas(3000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); // Rh - GT_Values.RA.stdBuilder().itemInputs(RHSulfate.get(cell, 11), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(RHSulfateSolution.get(cell, 11), LeachResidue.get(dustTiny, 10)) - .fluidInputs(Materials.Water.getFluid(10000)).fluidOutputs(Materials.Potassium.getMolten(2000)) - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(RHSulfate.get(cell, 11), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(RHSulfateSolution.get(cell, 11), LeachResidue.get(dustTiny, 10)) + .fluidInputs(Materials.Water.getFluid(10000)) + .fluidOutputs(Materials.Potassium.getMolten(2000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(3) }, - new FluidStack[] { Materials.Water.getFluid(36000), RHSulfate.getFluidOrGas(39600) }, - new FluidStack[] { Materials.Potassium.getMolten(7200), RHSulfateSolution.getFluidOrGas(39600) }, - new ItemStack[] { LeachResidue.get(dust, 4) }, - 1200, - 30); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Zinc.getDust(1)) - .itemOutputs(ZincSulfate.get(dust, 6), CrudeRhMetall.get(dust)) - .fluidInputs(RHSulfateSolution.getFluidOrGas(1000)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(CrudeRhMetall.get(dust), Materials.Salt.getDust(1)) - .itemOutputs(RHSalt.get(dust, 3)).fluidInputs(Materials.Chlorine.getGas(1000)).duration(15 * SECONDS) - .eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 600).addTo(blastFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(RHSalt.get(dust, 10)).fluidInputs(Materials.Water.getFluid(2000)) - .fluidOutputs(RHSaltSolution.getFluidOrGas(2000)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(mixerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(SodiumNitrate.get(dust, 5), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(RHNitrate.get(dust), Materials.Salt.getDust(2)) - .fluidInputs(RHSaltSolution.getFluidOrGas(1000)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + new ItemStack[] { GT_Utility.getIntegratedCircuit(3) }, + new FluidStack[] { Materials.Water.getFluid(36000), RHSulfate.getFluidOrGas(39600) }, + new FluidStack[] { Materials.Potassium.getMolten(7200), RHSulfateSolution.getFluidOrGas(39600) }, + new ItemStack[] { LeachResidue.get(dust, 4) }, + 1200, + 30); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Zinc.getDust(1)) + .itemOutputs(ZincSulfate.get(dust, 6), CrudeRhMetall.get(dust)) + .fluidInputs(RHSulfateSolution.getFluidOrGas(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(CrudeRhMetall.get(dust), Materials.Salt.getDust(1)) + .itemOutputs(RHSalt.get(dust, 3)) + .fluidInputs(Materials.Chlorine.getGas(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 600) + .addTo(blastFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(RHSalt.get(dust, 10)) + .fluidInputs(Materials.Water.getFluid(2000)) + .fluidOutputs(RHSaltSolution.getFluidOrGas(2000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(mixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(SodiumNitrate.get(dust, 5), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(RHNitrate.get(dust), Materials.Salt.getDust(2)) + .fluidInputs(RHSaltSolution.getFluidOrGas(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Na + HNO3 = NaNO3 + H - GT_Values.RA.stdBuilder().itemInputs(Materials.Sodium.getDust(1)).itemOutputs(SodiumNitrate.get(dust, 5)) - .fluidInputs(Materials.NitricAcid.getFluid(1000)).fluidOutputs(Materials.Hydrogen.getGas(1000)) - .duration(8 * TICKS).eut(60).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(RHNitrate.get(dust)) - .itemOutputs( - RhFilterCake.get(dust), - RhFilterCake.get(dust), - RhFilterCake.get(dust), - RhFilterCake.get(dust), - RhFilterCake.get(dust), - RhFilterCake.get(dust), - RhFilterCake.get(dust), - RhFilterCake.get(dust), - RhFilterCake.get(dust)) - .outputChances(1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1500).duration(30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sifterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(RhFilterCake.get(dust)).fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(RHFilterCakeSolution.getFluidOrGas(1000)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(mixerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).itemOutputs(ReRh.get(dust)) - .fluidInputs(RHFilterCakeSolution.getFluidOrGas(1000)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(ReRh.get(dust), Materials.Empty.getCells(1)) - .itemOutputs(Rhodium.get(dust), Materials.Ammonia.getCells(1)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)).fluidOutputs(Materials.Chlorine.getGas(1000)) - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sodium.getDust(1)) + .itemOutputs(SodiumNitrate.get(dust, 5)) + .fluidInputs(Materials.NitricAcid.getFluid(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(1000)) + .duration(8 * TICKS) + .eut(60) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(RHNitrate.get(dust)) + .itemOutputs( + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust), + RhFilterCake.get(dust)) + .outputChances(1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1500) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sifterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(RhFilterCake.get(dust)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(RHFilterCakeSolution.getFluidOrGas(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(mixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ReRh.get(dust)) + .fluidInputs(RHFilterCakeSolution.getFluidOrGas(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(ReRh.get(dust), Materials.Empty.getCells(1)) + .itemOutputs(Rhodium.get(dust), Materials.Ammonia.getCells(1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.Chlorine.getGas(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); } @@ -553,48 +731,51 @@ public class PlatinumSludgeOverHaul { @SuppressWarnings({ "unchecked", "rawtypes" }) public static void replacePureElements() { // furnace - for (Object entry : FurnaceRecipes.smelting().getSmeltingList().entrySet()) { + for (Object entry : FurnaceRecipes.smelting() + .getSmeltingList() + .entrySet()) { Map.Entry realEntry = (Map.Entry) entry; if (GT_Utility.isStackValid(realEntry.getKey()) - && BW_Util.checkStackAndPrefix((ItemStack) realEntry.getKey())) { + && BW_Util.checkStackAndPrefix((ItemStack) realEntry.getKey())) { ItemData association = GT_OreDictUnificator.getAssociation((ItemStack) realEntry.getKey()); if (!dust.equals(association.mPrefix) && !dustTiny.equals(association.mPrefix) - || !association.mMaterial.mMaterial.equals(Materials.Platinum)) + || !association.mMaterial.mMaterial.equals(Materials.Platinum)) if (GT_Utility.isStackValid(realEntry.getValue()) - && BW_Util.checkStackAndPrefix((ItemStack) realEntry.getValue())) { - ItemData ass = GT_OreDictUnificator.getAssociation((ItemStack) realEntry.getValue()); - if (ass.mMaterial.mMaterial.equals(Materials.Platinum)) - if (!PlatinumSludgeOverHaul.isInBlackList((ItemStack) realEntry.getKey())) - realEntry.setValue( - PTMetallicPowder.get( - ass.mPrefix == nugget ? dustTiny : dust, - ((ItemStack) realEntry.getValue()).stackSize * 2)); - else if (ass.mMaterial.mMaterial.equals(Materials.Palladium)) - if (!PlatinumSludgeOverHaul.isInBlackList((ItemStack) realEntry.getKey())) - realEntry.setValue( - PDMetallicPowder.get( - ass.mPrefix == nugget ? dustTiny : dust, - ((ItemStack) realEntry.getValue()).stackSize * 2)); - } + && BW_Util.checkStackAndPrefix((ItemStack) realEntry.getValue())) { + ItemData ass = GT_OreDictUnificator.getAssociation((ItemStack) realEntry.getValue()); + if (ass.mMaterial.mMaterial.equals(Materials.Platinum)) + if (!PlatinumSludgeOverHaul.isInBlackList((ItemStack) realEntry.getKey())) + realEntry.setValue( + PTMetallicPowder.get( + ass.mPrefix == nugget ? dustTiny : dust, + ((ItemStack) realEntry.getValue()).stackSize * 2)); + else if (ass.mMaterial.mMaterial.equals(Materials.Palladium)) + if (!PlatinumSludgeOverHaul.isInBlackList((ItemStack) realEntry.getKey())) + realEntry.setValue( + PDMetallicPowder.get( + ass.mPrefix == nugget ? dustTiny : dust, + ((ItemStack) realEntry.getValue()).stackSize * 2)); + } } } // vanilla crafting - CraftingManager.getInstance().getRecipeList().forEach(PlatinumSludgeOverHaul::setnewMaterialInRecipe); + CraftingManager.getInstance() + .getRecipeList() + .forEach(PlatinumSludgeOverHaul::setnewMaterialInRecipe); // gt crafting try { - ((List<IRecipe>) FieldUtils.getDeclaredField(GT_ModHandler.class, "sBufferRecipeList", true).get(null)) - .forEach(PlatinumSludgeOverHaul::setnewMaterialInRecipe); + ((List<IRecipe>) FieldUtils.getDeclaredField(GT_ModHandler.class, "sBufferRecipeList", true) + .get(null)).forEach(PlatinumSludgeOverHaul::setnewMaterialInRecipe); } catch (IllegalAccessException e) { e.printStackTrace(); } // gt machines maploop: for (RecipeMap<?> map : RecipeMap.ALL_RECIPE_MAPS.values()) { if (map == RecipeMaps.fusionRecipes || map == RecipeMaps.unpackagerRecipes - || map == RecipeMaps.packagerRecipes - || map == RecipeMaps.replicatorRecipes - || "gt.recipe.eyeofharmony".equals(map.unlocalizedName) - || "gtpp.recipe.quantumforcesmelter".equals(map.unlocalizedName)) - continue; + || map == RecipeMaps.packagerRecipes + || map == RecipeMaps.replicatorRecipes + || "gt.recipe.eyeofharmony".equals(map.unlocalizedName) + || "gtpp.recipe.quantumforcesmelter".equals(map.unlocalizedName)) continue; HashSet<GT_Recipe> toDel = new HashSet<>(); recipeloop: for (GT_Recipe recipe : map.getAllRecipes()) { if (recipe.mFakeRecipe) continue maploop; @@ -603,9 +784,9 @@ public class PlatinumSludgeOverHaul { if (map.equals(RecipeMaps.fluidExtractionRecipes)) continue maploop; if ("gtpp.recipe.alloyblastsmelter".equals(map.unlocalizedName)) continue maploop; if (map.equals(RecipeMaps.multiblockChemicalReactorRecipes) - || map.equals(RecipeMaps.chemicalReactorRecipes)) { + || map.equals(RecipeMaps.chemicalReactorRecipes)) { if (GT_Utility.areFluidsEqual(Ruthenium.getMolten(1), recipe.mFluidOutputs[i]) - || GT_Utility.areFluidsEqual(Rhodium.getMolten(1), recipe.mFluidOutputs[i])) + || GT_Utility.areFluidsEqual(Rhodium.getMolten(1), recipe.mFluidOutputs[i])) toDel.add(recipe); else if (GT_Utility.areFluidsEqual(Materials.Iridium.getMolten(1), recipe.mFluidOutputs[i])) { recipe.mFluidOutputs[i] = AcidicIridiumSolution.getFluidOrGas(1000); @@ -620,9 +801,9 @@ public class PlatinumSludgeOverHaul { recipe.reloadOwner(); } } else if (GT_Utility.areFluidsEqual(Ruthenium.getMolten(1), recipe.mFluidOutputs[i]) - || GT_Utility.areFluidsEqual(Rhodium.getMolten(1), recipe.mFluidOutputs[i]) - || GT_Utility.areFluidsEqual(Materials.Iridium.getMolten(1), recipe.mFluidOutputs[i]) - || GT_Utility.areFluidsEqual(Materials.Platinum.getMolten(1), recipe.mFluidOutputs[i])) + || GT_Utility.areFluidsEqual(Rhodium.getMolten(1), recipe.mFluidOutputs[i]) + || GT_Utility.areFluidsEqual(Materials.Iridium.getMolten(1), recipe.mFluidOutputs[i]) + || GT_Utility.areFluidsEqual(Materials.Platinum.getMolten(1), recipe.mFluidOutputs[i])) toDel.add(recipe); else if (GT_Utility.areFluidsEqual(Materials.Osmium.getMolten(1), recipe.mFluidOutputs[i])) toDel.add(recipe); @@ -630,9 +811,9 @@ public class PlatinumSludgeOverHaul { for (int i = 0; i < recipe.mOutputs.length; i++) { if (!GT_Utility.isStackValid(recipe.mOutputs[i])) continue; if ((BW_Util.areStacksEqualOrNull(Ruthenium.get(dust), recipe.mOutputs[i]) - || BW_Util.areStacksEqualOrNull(Ruthenium.get(dustImpure), recipe.mOutputs[i]) - || BW_Util.areStacksEqualOrNull(Ruthenium.get(dustPure), recipe.mOutputs[i])) - && !BW_Util.areStacksEqualOrNull(Ruthenium.get(ingot), recipe.mInputs[0])) { + || BW_Util.areStacksEqualOrNull(Ruthenium.get(dustImpure), recipe.mOutputs[i]) + || BW_Util.areStacksEqualOrNull(Ruthenium.get(dustPure), recipe.mOutputs[i])) + && !BW_Util.areStacksEqualOrNull(Ruthenium.get(ingot), recipe.mInputs[0])) { for (ItemStack mInput : recipe.mInputs) if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop; int amount = recipe.mOutputs[i].stackSize * 2; @@ -640,9 +821,9 @@ public class PlatinumSludgeOverHaul { recipe.reloadOwner(); } if ((BW_Util.areStacksEqualOrNull(Rhodium.get(dust), recipe.mOutputs[i]) - || BW_Util.areStacksEqualOrNull(Rhodium.get(dustImpure), recipe.mOutputs[i]) - || BW_Util.areStacksEqualOrNull(Rhodium.get(dustPure), recipe.mOutputs[i])) - && !BW_Util.areStacksEqualOrNull(Rhodium.get(ingot), recipe.mInputs[0])) { + || BW_Util.areStacksEqualOrNull(Rhodium.get(dustImpure), recipe.mOutputs[i]) + || BW_Util.areStacksEqualOrNull(Rhodium.get(dustPure), recipe.mOutputs[i])) + && !BW_Util.areStacksEqualOrNull(Rhodium.get(ingot), recipe.mInputs[0])) { for (ItemStack mInput : recipe.mInputs) if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop; int amount = recipe.mOutputs[i].stackSize * 2; @@ -652,13 +833,13 @@ public class PlatinumSludgeOverHaul { if (!BW_Util.checkStackAndPrefix(recipe.mOutputs[i])) continue; // Pt if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mMaterial.mMaterial - .equals(Materials.Platinum)) { + .equals(Materials.Platinum)) { for (ItemStack mInput : recipe.mInputs) { if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop; } if (dust.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) - || dustImpure.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) - || dustPure.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { + || dustImpure.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) + || dustPure.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { int amount = recipe.mOutputs[i].stackSize; recipe.mOutputs[i] = BW_Util.setStackSize(PTMetallicPowder.get(dust), amount * 2); recipe.reloadOwner(); @@ -672,93 +853,86 @@ public class PlatinumSludgeOverHaul { recipe.reloadOwner(); } } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mMaterial.mMaterial - .equals(Materials.Palladium)) { + .equals(Materials.Palladium)) { + for (ItemStack mInput : recipe.mInputs) { + if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop; + } + if (dust.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) + || dustImpure.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) + || dustPure.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { + int amount = recipe.mOutputs[i].stackSize; + recipe.mOutputs[i] = BW_Util.setStackSize(PDMetallicPowder.get(dust), amount * 4); + recipe.reloadOwner(); + } else + if (dustSmall.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { + int amount = recipe.mOutputs[i].stackSize; + recipe.mOutputs[i] = BW_Util + .setStackSize(PDMetallicPowder.get(dustSmall), amount * 4); + recipe.reloadOwner(); + } else if (dustTiny + .equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { + int amount = recipe.mOutputs[i].stackSize; + recipe.mOutputs[i] = BW_Util + .setStackSize(PDMetallicPowder.get(dustTiny), amount * 4); + recipe.reloadOwner(); + } + } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mMaterial.mMaterial + .equals(Materials.Osmium)) { for (ItemStack mInput : recipe.mInputs) { if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop; } if (dust.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) - || dustImpure - .equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) - || dustPure.equals( - GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { + || dustImpure + .equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) + || dustPure + .equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = BW_Util.setStackSize(PDMetallicPowder.get(dust), amount * 4); + recipe.mOutputs[i] = BW_Util.setStackSize(IrOsLeachResidue.get(dust), amount); recipe.reloadOwner(); } else if (dustSmall + .equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { + int amount = recipe.mOutputs[i].stackSize; + recipe.mOutputs[i] = BW_Util + .setStackSize(IrOsLeachResidue.get(dustSmall), amount); + recipe.reloadOwner(); + } else if (dustTiny .equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { int amount = recipe.mOutputs[i].stackSize; recipe.mOutputs[i] = BW_Util - .setStackSize(PDMetallicPowder.get(dustSmall), amount * 4); + .setStackSize(IrOsLeachResidue.get(dustTiny), amount); recipe.reloadOwner(); - } else - if (dustTiny - .equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { - int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = BW_Util - .setStackSize(PDMetallicPowder.get(dustTiny), amount * 4); - recipe.reloadOwner(); - } - } else - if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mMaterial.mMaterial - .equals(Materials.Osmium)) { + } + } else if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mMaterial.mMaterial + .equals(Materials.Iridium)) { for (ItemStack mInput : recipe.mInputs) { if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop; } if (dust.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) - || dustImpure.equals( - GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) - || dustPure.equals( - GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { + || dustImpure + .equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) + || dustPure + .equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = BW_Util.setStackSize(IrOsLeachResidue.get(dust), amount); + recipe.mOutputs[i] = BW_Util.setStackSize(IrLeachResidue.get(dust), amount); recipe.reloadOwner(); } else if (dustSmall + .equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { + int amount = recipe.mOutputs[i].stackSize; + recipe.mOutputs[i] = BW_Util + .setStackSize(IrLeachResidue.get(dustSmall), amount); + recipe.reloadOwner(); + } else if (dustTiny .equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { int amount = recipe.mOutputs[i].stackSize; recipe.mOutputs[i] = BW_Util - .setStackSize(IrOsLeachResidue.get(dustSmall), amount); + .setStackSize(IrLeachResidue.get(dustTiny), amount); recipe.reloadOwner(); - } else - if (dustTiny.equals( - GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { - int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = BW_Util - .setStackSize(IrOsLeachResidue.get(dustTiny), amount); - recipe.reloadOwner(); - } - } else - if (GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mMaterial.mMaterial - .equals(Materials.Iridium)) { - for (ItemStack mInput : recipe.mInputs) { - if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop; - } - if (dust.equals(GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) - || dustImpure.equals( - GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix) - || dustPure.equals( - GT_OreDictUnificator - .getAssociation(recipe.mOutputs[i]).mPrefix)) { - int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = BW_Util.setStackSize(IrLeachResidue.get(dust), amount); - recipe.reloadOwner(); - } else if (dustSmall.equals( - GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { - int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = BW_Util - .setStackSize(IrLeachResidue.get(dustSmall), amount); - recipe.reloadOwner(); - } else - if (dustTiny.equals( - GT_OreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) { - int amount = recipe.mOutputs[i].stackSize; - recipe.mOutputs[i] = BW_Util - .setStackSize(IrLeachResidue.get(dustTiny), amount); - recipe.reloadOwner(); - } - } + } + } } } - map.getBackend().removeRecipes(toDel); + map.getBackend() + .removeRecipes(toDel); } // TODO: remove EnderIO recipes @@ -771,15 +945,15 @@ public class PlatinumSludgeOverHaul { @SuppressWarnings("deprecation") private static void replaceHVCircuitMaterials() { GT_Values.RA.addMixerRecipe( - Materials.Redstone.getDust(1), - Materials.Electrum.getDust(1), - GT_Utility.getIntegratedCircuit(1), - null, - null, - null, - Materials.Nikolite.getDust(8), - 1800, - 120); + Materials.Redstone.getDust(1), + Materials.Electrum.getDust(1), + GT_Utility.getIntegratedCircuit(1), + null, + null, + null, + Materials.Nikolite.getDust(8), + 1800, + 120); for (GT_Recipe recipe : RecipeMaps.circuitAssemblerRecipes.getAllRecipes()) { if (recipe.mEUt > 512) continue; if (BW_Util.checkStackAndPrefix(recipe.mOutputs[0])) { @@ -804,8 +978,10 @@ public class PlatinumSludgeOverHaul { inputItemName = "recipeItems"; } else if (GTPlusPlus.isModLoaded()) { try { - if (Class.forName("gtPlusPlus.api.objects.minecraft.ShapedRecipe").isAssignableFrom(obj.getClass())) - obj = CachedReflectionUtils.getField(obj.getClass(), "mRecipe").get(obj); + if (Class.forName("gtPlusPlus.api.objects.minecraft.ShapedRecipe") + .isAssignableFrom(obj.getClass())) + obj = CachedReflectionUtils.getField(obj.getClass(), "mRecipe") + .get(obj); } catch (ClassNotFoundException | IllegalAccessException e) { e.printStackTrace(); } @@ -883,7 +1059,7 @@ public class PlatinumSludgeOverHaul { for (Object stack : stacks) { if (stack instanceof ItemStack - && GT_Utility.areStacksEqual(GT_OreDictUnificator.get(crateGtDust, mat, 1), (ItemStack) stack)) + && GT_Utility.areStacksEqual(GT_OreDictUnificator.get(crateGtDust, mat, 1), (ItemStack) stack)) return true; } @@ -894,7 +1070,7 @@ public class PlatinumSludgeOverHaul { break; } allSame = BW_Util.checkStackAndPrefix((ItemStack) stack) - && GT_OreDictUnificator.getAssociation((ItemStack) stack).mMaterial.mMaterial.equals(mat); + && GT_OreDictUnificator.getAssociation((ItemStack) stack).mMaterial.mMaterial.equals(mat); if (!allSame) break; } return allSame; @@ -904,60 +1080,72 @@ public class PlatinumSludgeOverHaul { private static boolean isInBlackList(ItemStack stack) { if (stack == null || stack.getItem() instanceof BW_MetaGenerated_Items - || MainMod.MOD_ID.equals(GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId) - || BartWorksCrossmod.MOD_ID.equals(GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId)) + || MainMod.MOD_ID.equals(GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId) + || BartWorksCrossmod.MOD_ID.equals(GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId)) return true; if (GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId.equals(NewHorizonsCoreMod.ID) - && !stack.getUnlocalizedName().contains("dust") - && !stack.getUnlocalizedName().contains("Dust")) + && !stack.getUnlocalizedName() + .contains("dust") + && !stack.getUnlocalizedName() + .contains("Dust")) return true; if (Block.getBlockFromItem(stack.getItem()) instanceof GT_Generic_Block - && !(Block.getBlockFromItem(stack.getItem()) instanceof GT_Block_Ores_Abstract)) - return true; + && !(Block.getBlockFromItem(stack.getItem()) instanceof GT_Block_Ores_Abstract)) return true; - if (Arrays.stream(ItemList.values()).filter(ItemList::hasBeenSet) - .anyMatch(e -> !BW_Util.checkStackAndPrefix(stack) && GT_Utility.areStacksEqual(e.get(1), stack, true))) + if (Arrays.stream(ItemList.values()) + .filter(ItemList::hasBeenSet) + .anyMatch(e -> !BW_Util.checkStackAndPrefix(stack) && GT_Utility.areStacksEqual(e.get(1), stack, true))) return true; if (stack.getItem() instanceof GT_Generic_Item) { if (!BW_Util.checkStackAndPrefix(stack)) return false; if (GT_OreDictUnificator.getAssociation(stack).mPrefix != rawOre) { return !Arrays.asList(PlatinumSludgeOverHaul.OPBLACKLIST) - .contains(GT_OreDictUnificator.getAssociation(stack).mPrefix) - || Arrays.asList(PlatinumSludgeOverHaul.BLACKLIST) - .contains(GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial); + .contains(GT_OreDictUnificator.getAssociation(stack).mPrefix) + || Arrays.asList(PlatinumSludgeOverHaul.BLACKLIST) + .contains(GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial); } } if (GTPlusPlus.isModLoaded()) { try { if (Class.forName("gtPlusPlus.core.item.base.BaseItemComponent") - .isAssignableFrom(stack.getItem().getClass()) && !stack.getUnlocalizedName().contains("dust") - && !stack.getUnlocalizedName().contains("Dust")) + .isAssignableFrom( + stack.getItem() + .getClass()) + && !stack.getUnlocalizedName() + .contains("dust") + && !stack.getUnlocalizedName() + .contains("Dust")) return true; if (Class.forName("gtPlusPlus.core.block.base.BlockBaseModular") - .isAssignableFrom(Block.getBlockFromItem(stack.getItem()).getClass())) + .isAssignableFrom( + Block.getBlockFromItem(stack.getItem()) + .getClass())) return true; } catch (ClassNotFoundException e) { e.printStackTrace(); } - if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustHeLiCoPtEr", 1L).getItem()) { + if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustHeLiCoPtEr", 1L) + .getItem()) { return true; } - if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustWhiteMetal", 1L).getItem()) { + if (stack.getItem() == GT_ModHandler.getModItem(GTPlusPlus.ID, "itemDustWhiteMetal", 1L) + .getItem()) { return true; } } if (GalaxySpace.isModLoaded()) { - if (stack.getItem() == GT_ModHandler.getModItem(GalaxySpace.ID, "metalsblock", 1L, 7).getItem()) { + if (stack.getItem() == GT_ModHandler.getModItem(GalaxySpace.ID, "metalsblock", 1L, 7) + .getItem()) { return true; } } if (NewHorizonsCoreMod.isModLoaded()) { - if (stack.getItem() - == GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IndustryFrame", 1L).getItem()) { + if (stack.getItem() == GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IndustryFrame", 1L) + .getItem()) { return true; } } @@ -965,6 +1153,6 @@ public class PlatinumSludgeOverHaul { return false; } return Arrays.asList(PlatinumSludgeOverHaul.BLACKLIST) - .contains(GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial); + .contains(GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java index 8b215e3d36..af8651dc6b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java @@ -76,13 +76,13 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { }; private static final List<String> BWModNames = Arrays - .asList(MainMod.NAME, BartWorksCrossmod.NAME, MaterialsInjector.NAME); + .asList(MainMod.NAME, BartWorksCrossmod.NAME, MaterialsInjector.NAME); private static final HashSet<Short> idHashSet = new HashSet<>(); private static final Werkstoff.Stats DEFAULT_NULL_STATS = new Werkstoff.Stats(); private static final Werkstoff.GenerationFeatures DEFAULT_NULL_GENERATION_FEATURES = new Werkstoff.GenerationFeatures() - .disable(); + .disable(); public static Werkstoff default_null_Werkstoff; private final HashSet<String> ADDITIONAL_OREDICT = new HashSet<>(); @@ -111,14 +111,14 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { public static void init() { Werkstoff.default_null_Werkstoff = new Werkstoff( - new short[3], - "_NULL", - "Default null Werkstoff", - Werkstoff.DEFAULT_NULL_STATS, - Werkstoff.Types.UNDEFINED, - Werkstoff.DEFAULT_NULL_GENERATION_FEATURES, - -1, - TextureSet.SET_NONE); + new short[3], + "_NULL", + "Default null Werkstoff", + Werkstoff.DEFAULT_NULL_STATS, + Werkstoff.Types.UNDEFINED, + Werkstoff.DEFAULT_NULL_GENERATION_FEATURES, + -1, + TextureSet.SET_NONE); } /** @@ -131,15 +131,15 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { */ public Werkstoff(Materials materials, Werkstoff.GenerationFeatures generationFeatures, Types type, int mID) { this( - materials.mRGBa, - materials.mDefaultLocalName, - materials.getToolTip(), - type == null ? materials.mElement != null ? Types.ELEMENT : Types.UNDEFINED : type, - generationFeatures, - mID, - materials.mIconSet, - (List) materials.mOreByProducts, - new Pair<>(materials, 1)); + materials.mRGBa, + materials.mDefaultLocalName, + materials.getToolTip(), + type == null ? materials.mElement != null ? Types.ELEMENT : Types.UNDEFINED : type, + generationFeatures, + mID, + materials.mIconSet, + (List) materials.mOreByProducts, + new Pair<>(materials, 1)); if (mID <= 31_766 || mID > 32_767) throw new IllegalArgumentException(); this.stats.mass = materials.getMass(); this.stats.protons = materials.getProtons(); @@ -163,87 +163,89 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { @SafeVarargs public Werkstoff(short[] rgba, String defaultName, Werkstoff.Types type, int meltingpoint, - Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, - Pair<ISubTagContainer, Integer>... contents) { + Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, + Pair<ISubTagContainer, Integer>... contents) { this( - rgba, - defaultName, - Werkstoff.Types.getDefaultStatForType(type).setMeltingPoint(meltingpoint), - type, - generationFeatures, - mID, - texSet, - contents); + rgba, + defaultName, + Werkstoff.Types.getDefaultStatForType(type) + .setMeltingPoint(meltingpoint), + type, + generationFeatures, + mID, + texSet, + contents); } @SafeVarargs public Werkstoff(short[] rgba, String defaultName, Werkstoff.Types type, - Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, - Pair<ISubTagContainer, Integer>... contents) { + Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, + Pair<ISubTagContainer, Integer>... contents) { this( - rgba, - defaultName, - Werkstoff.Types.getDefaultStatForType(type), - type, - generationFeatures, - mID, - texSet, - contents); + rgba, + defaultName, + Werkstoff.Types.getDefaultStatForType(type), + type, + generationFeatures, + mID, + texSet, + contents); } @SafeVarargs public Werkstoff(short[] rgba, String defaultName, Werkstoff.Types type, int meltingpoint, - Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, - List<ISubTagContainer> oreByProduct, Pair<ISubTagContainer, Integer>... contents) { + Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, + List<ISubTagContainer> oreByProduct, Pair<ISubTagContainer, Integer>... contents) { this( - rgba, - defaultName, - Werkstoff.Types.getDefaultStatForType(type).setMeltingPoint(meltingpoint), - type, - generationFeatures, - mID, - texSet, - oreByProduct, - contents); + rgba, + defaultName, + Werkstoff.Types.getDefaultStatForType(type) + .setMeltingPoint(meltingpoint), + type, + generationFeatures, + mID, + texSet, + oreByProduct, + contents); } @SafeVarargs public Werkstoff(short[] rgba, String defaultName, Werkstoff.Types type, - Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, - List<ISubTagContainer> oreByProduct, Pair<ISubTagContainer, Integer>... contents) { + Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, + List<ISubTagContainer> oreByProduct, Pair<ISubTagContainer, Integer>... contents) { this( - rgba, - defaultName, - Werkstoff.Types.getDefaultStatForType(type), - type, - generationFeatures, - mID, - texSet, - oreByProduct, - contents); + rgba, + defaultName, + Werkstoff.Types.getDefaultStatForType(type), + type, + generationFeatures, + mID, + texSet, + oreByProduct, + contents); } @SafeVarargs public Werkstoff(short[] rgba, String toolTip, String defaultName, Werkstoff.Types type, - Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, - List<ISubTagContainer> oreByProduct, Pair<ISubTagContainer, Integer>... contents) { + Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, + List<ISubTagContainer> oreByProduct, Pair<ISubTagContainer, Integer>... contents) { this( - rgba, - toolTip, - defaultName, - Werkstoff.Types.getDefaultStatForType(type), - type, - generationFeatures, - mID, - texSet, - oreByProduct, - contents); + rgba, + toolTip, + defaultName, + Werkstoff.Types.getDefaultStatForType(type), + type, + generationFeatures, + mID, + texSet, + oreByProduct, + contents); } @SafeVarargs public Werkstoff(short[] rgba, String defaultName, Werkstoff.Stats stats, Werkstoff.Types type, - Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, - List<ISubTagContainer> oreByProduct, Pair<ISubTagContainer, Integer>... contents) { + Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, + List<ISubTagContainer> oreByProduct, Pair<ISubTagContainer, Integer>... contents) { this(rgba, defaultName, "", stats, type, generationFeatures, mID, texSet, contents); this.mOreByProducts.clear(); this.mOreByProducts.addAll(oreByProduct); @@ -251,15 +253,15 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { @SafeVarargs public Werkstoff(short[] rgba, String defaultName, Werkstoff.Stats stats, Werkstoff.Types type, - Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, - Pair<ISubTagContainer, Integer>... contents) { + Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, + Pair<ISubTagContainer, Integer>... contents) { this(rgba, defaultName, "", stats, type, generationFeatures, mID, texSet, contents); } @SafeVarargs public Werkstoff(short[] rgba, String defaultName, String toolTip, Werkstoff.Stats stats, Werkstoff.Types type, - Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, - List<ISubTagContainer> oreByProduct, Pair<ISubTagContainer, Integer>... contents) { + Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, + List<ISubTagContainer> oreByProduct, Pair<ISubTagContainer, Integer>... contents) { this(rgba, defaultName, toolTip, stats, type, generationFeatures, mID, texSet, contents); this.mOreByProducts.clear(); this.mOreByProducts.addAll(oreByProduct); @@ -267,8 +269,8 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { @SafeVarargs public Werkstoff(short[] rgba, String defaultName, String toolTip, Werkstoff.Stats stats, Werkstoff.Types type, - Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, - Pair<ISubTagContainer, Integer>... contents) { + Werkstoff.GenerationFeatures generationFeatures, int mID, TextureSet texSet, + Pair<ISubTagContainer, Integer>... contents) { if (Werkstoff.idHashSet.contains((short) mID)) throw new UnsupportedOperationException("ID (" + mID + ") is already in use!"); @@ -291,24 +293,24 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { if (p.getKey() instanceof Materials) { if (((Materials) p.getKey()).mMaterialList.size() > 1 && p.getValue() > 1) this.toolTip += "(" + getFormula((Materials) p.getKey()) - + ")" - + BW_Util.subscriptNumber(p.getValue()); + + ")" + + BW_Util.subscriptNumber(p.getValue()); else this.toolTip += getFormula((Materials) p.getKey()) - + (p.getValue() > 1 ? BW_Util.subscriptNumber(p.getValue()) : ""); + + (p.getValue() > 1 ? BW_Util.subscriptNumber(p.getValue()) : ""); } if (p.getKey() instanceof Werkstoff) { if (((Werkstoff) p.getKey()).CONTENTS.size() > 1 && p.getValue() > 1) this.toolTip += "(" + getFormula((Werkstoff) p.getKey()) - + ")" - + BW_Util.subscriptNumber(p.getValue()); + + ")" + + BW_Util.subscriptNumber(p.getValue()); else this.toolTip += getFormula((Werkstoff) p.getKey()) - + (p.getValue() > 1 ? BW_Util.subscriptNumber(p.getValue()) : ""); + + (p.getValue() > 1 ? BW_Util.subscriptNumber(p.getValue()) : ""); } } else if (p.getKey() instanceof Materials) { this.toolTip += getFormula((Materials) p.getKey()) - + (p.getValue() > 1 ? BW_Util.subscriptNumber(p.getValue()) : ""); - } else if (p.getKey() instanceof Werkstoff) this.toolTip += getFormula((Werkstoff) p.getKey()) + (p.getValue() > 1 ? BW_Util.subscriptNumber(p.getValue()) : ""); + } else if (p.getKey() instanceof Werkstoff) this.toolTip += getFormula((Werkstoff) p.getKey()) + + (p.getValue() > 1 ? BW_Util.subscriptNumber(p.getValue()) : ""); } } else this.toolTip = toolTip; @@ -366,10 +368,13 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { } Optional<Pair<ISubTagContainer, Integer>> firstContent; - if (this.CONTENTS.size() == 1 && (firstContent = this.CONTENTS.stream().findFirst()).isPresent()) { - ISubTagContainer firstContentSubTagContainer = firstContent.get().getKey(); - if (firstContent.get().getValue() == 1 && firstContentSubTagContainer instanceof Materials) - this.getGenerationFeatures().setExtension(); + if (this.CONTENTS.size() == 1 && (firstContent = this.CONTENTS.stream() + .findFirst()).isPresent()) { + ISubTagContainer firstContentSubTagContainer = firstContent.get() + .getKey(); + if (firstContent.get() + .getValue() == 1 && firstContentSubTagContainer instanceof Materials) this.getGenerationFeatures() + .setExtension(); } Werkstoff.werkstoffHashSet.add(this); @@ -405,13 +410,13 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { if (this.stats.mTC_Aspects == null) { HashSet<TC_Aspects.TC_AspectStack> tc_aspectStacks = new HashSet<>(); HashSet<Pair<Object, Integer>> set = new HashSet<>(); - for (Pair<?, ?> p : this.getContents().getValue()) { + for (Pair<?, ?> p : this.getContents() + .getValue()) { if (p.getKey() instanceof Materials) tc_aspectStacks.addAll(((Materials) p.getKey()).mAspects); if (p.getKey() instanceof Werkstoff) set.addAll(Arrays.asList(((Werkstoff) p.getKey()).getTCAspects())); } tc_aspectStacks.forEach( - tc_aspectStack -> set - .add(new Pair<>(tc_aspectStack.mAspect.mAspect, (int) tc_aspectStack.mAmount))); + tc_aspectStack -> set.add(new Pair<>(tc_aspectStack.mAspect.mAspect, (int) tc_aspectStack.mAmount))); this.stats.mTC_Aspects = set.toArray(new Pair[0]); } Pair<Object, Integer>[] ret = this.stats.mTC_Aspects.clone(); @@ -423,15 +428,16 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { public List<TC_Aspects.TC_AspectStack> getGTWrappedTCAspects() { final List<TC_Aspects.TC_AspectStack> ret = new ArrayList<>(); - Arrays.stream(this.getTCAspects()).forEach(objectIntegerPair -> { - try { - new TC_Aspects.TC_AspectStack( + Arrays.stream(this.getTCAspects()) + .forEach(objectIntegerPair -> { + try { + new TC_Aspects.TC_AspectStack( TC_Aspects.valueOf( - ((String) ThaumcraftHandler.AspectAdder.getName.invoke(objectIntegerPair.getKey())) - .toUpperCase(Locale.US)), + ((String) ThaumcraftHandler.AspectAdder.getName.invoke(objectIntegerPair.getKey())) + .toUpperCase(Locale.US)), objectIntegerPair.getValue()).addToAspectList(ret); - } catch (IllegalAccessException | InvocationTargetException ignored) {} - }); + } catch (IllegalAccessException | InvocationTargetException ignored) {} + }); return ret; } @@ -445,7 +451,8 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { public boolean containsStuff(ISubTagContainer stuff) { for (Pair<ISubTagContainer, Integer> pair : this.CONTENTS) { - if (pair.getKey().equals(stuff)) return true; + if (pair.getKey() + .equals(stuff)) return true; } return false; } @@ -499,9 +506,9 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { public String getLocalizedName() { return GT_LanguageManager.addStringLocalization( - String.format("bw.werkstoff.%05d.name", this.mID), - this.defaultName, - !GregTech_API.sPostloadFinished); + String.format("bw.werkstoff.%05d.name", this.mID), + this.defaultName, + !GregTech_API.sPostloadFinished); } public String getVarName() { @@ -514,9 +521,9 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { public String getLocalizedToolTip() { return GT_LanguageManager.addStringLocalization( - String.format("bw.werkstoff.%05d.tooltip", this.mID), - this.toolTip, - !GregTech_API.sPostloadFinished); + String.format("bw.werkstoff.%05d.tooltip", this.mID), + this.toolTip, + !GregTech_API.sPostloadFinished); } public Werkstoff.Stats getStats() { @@ -551,8 +558,9 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { @Override public boolean contains(SubTag subTag) { if (!subTag.equals(WerkstoffLoader.NOBLE_GAS) && !subTag.equals(WerkstoffLoader.ANAEROBE_GAS) - && !subTag.equals(WerkstoffLoader.NO_BLAST)) - for (Pair<ISubTagContainer, Integer> p : this.CONTENTS) if (p.getKey().contains(subTag)) return true; + && !subTag.equals(WerkstoffLoader.NO_BLAST)) + for (Pair<ISubTagContainer, Integer> p : this.CONTENTS) if (p.getKey() + .contains(subTag)) return true; return this.SUBTAGS.contains(subTag); } @@ -589,27 +597,39 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { public byte getToolQuality() { return this.stats.getQualityOverride() > 0 ? this.stats.getQualityOverride() - : (byte) (15f * (this.getStats().getProtons() / 188f + this.getStats().getMeltingPoint() / 10801f) - / (float) this.getContents().getKey()); + : (byte) (15f * (this.getStats() + .getProtons() / 188f + + this.getStats() + .getMeltingPoint() / 10801f) + / (float) this.getContents() + .getKey()); } public float getToolSpeed() { return this.stats.getSpeedOverride() > 0f ? this.stats.getSpeedOverride() - : Math.max( - 1f, - 2f * (-this.getStats().getMass() + 0.1f * this.getStats().getMeltingPoint() - + this.getStats().getProtons()) - * 0.1f - / (float) this.getContents().getKey() - * 0.1f - * this.getToolQuality()); + : Math.max( + 1f, + 2f * (-this.getStats() + .getMass() + 0.1f + * this.getStats() + .getMeltingPoint() + + this.getStats() + .getProtons()) + * 0.1f + / (float) this.getContents() + .getKey() + * 0.1f + * this.getToolQuality()); } public int getDurability() { return this.stats.getDurOverride() > 0 ? this.stats.getDurOverride() - : (int) (this.stats.durMod * (0.01f * this.getStats().getMeltingPoint() - * this.getStats().getMass() - / (float) this.getContents().getKey())); + : (int) (this.stats.durMod * (0.01f * this.getStats() + .getMeltingPoint() + * this.getStats() + .getMass() + / (float) this.getContents() + .getKey())); } /** @@ -618,7 +638,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { public boolean hasItemType(OrePrefixes prefixes) { int unpacked = Werkstoff.GenerationFeatures.getPrefixDataRaw(prefixes); return (this.getGenerationFeatures().toGenerate & unpacked) != 0 - && (this.getGenerationFeatures().blacklist & unpacked) == 0; + && (this.getGenerationFeatures().blacklist & unpacked) == 0; } /** @@ -641,7 +661,9 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { } private String getMaterialOwner() { - String modName = Loader.instance().activeModContainer().getName(); + String modName = Loader.instance() + .activeModContainer() + .getName(); if (modNameOverrides.get(modName) != null) { return modNameOverrides.get(modName); } @@ -686,7 +708,8 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { public GenerationFeatures() {} public static void initPrefixLogic() { - Arrays.stream(OrePrefixes.values()).forEach(e -> prefixLogic.put(e, 0)); + Arrays.stream(OrePrefixes.values()) + .forEach(e -> prefixLogic.put(e, 0)); Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dust, 0b1); Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dustTiny, 0b1); Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.dustSmall, 0b1); @@ -1103,28 +1126,33 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { if (!(o instanceof Werkstoff.Stats that)) return false; if (this.boilingPoint != that.boilingPoint || this.meltingPoint != that.meltingPoint - || this.mass != that.mass - || this.protons != that.protons) - return false; + || this.mass != that.mass + || this.protons != that.protons) return false; if (this.neutrons != that.neutrons) return false; if (this.electrons != that.electrons) return false; if (Math.abs(this.ebfGasRecipeTimeMultiplier - that.ebfGasRecipeTimeMultiplier) > 1.0e-6D) return false; if (Math.abs(this.ebfGasRecipeConsumedAmountMultiplier - that.ebfGasRecipeConsumedAmountMultiplier) - > 1.0e-6D) - return false; + > 1.0e-6D) return false; return this.quality == that.quality; } @Override public int hashCode() { return MurmurHash3.murmurhash3_x86_32( - ByteBuffer.allocate(49).put(this.quality).putInt(this.boilingPoint).putInt(this.meltingPoint) - .putLong(this.protons).putLong(this.neutrons).putLong(this.electrons).putLong(this.mass) - .putDouble(this.ebfGasRecipeTimeMultiplier) - .putDouble(this.ebfGasRecipeConsumedAmountMultiplier).array(), - 0, - 49, - 31); + ByteBuffer.allocate(49) + .put(this.quality) + .putInt(this.boilingPoint) + .putInt(this.meltingPoint) + .putLong(this.protons) + .putLong(this.neutrons) + .putLong(this.electrons) + .putLong(this.mass) + .putDouble(this.ebfGasRecipeTimeMultiplier) + .putDouble(this.ebfGasRecipeConsumedAmountMultiplier) + .array(), + 0, + 49, + 31); } public Werkstoff.Stats setMass(long mass) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index 338b18eff1..197ada7f22 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -187,1228 +187,1396 @@ public class WerkstoffLoader { // Tec & basdxz reserved range 30_000-31_000 // GT Material range reserved on 31_767-32_767 public static final Werkstoff Bismutite = new Werkstoff( - new short[] { 255, 233, 0, 0 }, - "Bismutite", - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems(), - 1, - TextureSet.SET_FLINT, - Collections.singletonList(Materials.Bismuth), - new Pair<>(Materials.Bismuth, 2), - new Pair<>(Materials.Oxygen, 2), - new Pair<>(Materials.CarbonDioxide, 2)); + new short[] { 255, 233, 0, 0 }, + "Bismutite", + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems(), + 1, + TextureSet.SET_FLINT, + Collections.singletonList(Materials.Bismuth), + new Pair<>(Materials.Bismuth, 2), + new Pair<>(Materials.Oxygen, 2), + new Pair<>(Materials.CarbonDioxide, 2)); public static final Werkstoff Bismuthinit = new Werkstoff( - new short[] { 192, 192, 192, 0 }, - "Bismuthinite", - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 2, - TextureSet.SET_METALLIC, - Arrays.asList(Materials.Bismuth, Materials.Sulfur), - new Pair<>(Materials.Bismuth, 2), - new Pair<>(Materials.Sulfur, 3)); + new short[] { 192, 192, 192, 0 }, + "Bismuthinite", + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 2, + TextureSet.SET_METALLIC, + Arrays.asList(Materials.Bismuth, Materials.Sulfur), + new Pair<>(Materials.Bismuth, 2), + new Pair<>(Materials.Sulfur, 3)); public static final Werkstoff Zirconium = new Werkstoff( - new short[] { 175, 175, 175, 0 }, - "Zirconium", - "Zr", - new Werkstoff.Stats().setProtons(40).setBlastFurnace(true).setMeltingPoint(2130).setMeltingVoltage(480), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), - 3, - TextureSet.SET_METALLIC + new short[] { 175, 175, 175, 0 }, + "Zirconium", + "Zr", + new Werkstoff.Stats().setProtons(40) + .setBlastFurnace(true) + .setMeltingPoint(2130) + .setMeltingVoltage(480), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMetalItems() + .enforceUnification(), + 3, + TextureSet.SET_METALLIC // No Byproducts ); public static final Werkstoff CubicZirconia = new Werkstoff( - new short[] { 255, 255, 255, 0 }, - "Cubic Zirconia", - Werkstoff.Types.COMPOUND, - 3273, - new Werkstoff.GenerationFeatures().onlyDust().addGems().enforceUnification(), - 4, - TextureSet.SET_DIAMOND, - Collections.singletonList(WerkstoffLoader.Zirconium), - new Pair<>(WerkstoffLoader.Zirconium, 1), - new Pair<>(Materials.Oxygen, 2)); + new short[] { 255, 255, 255, 0 }, + "Cubic Zirconia", + Werkstoff.Types.COMPOUND, + 3273, + new Werkstoff.GenerationFeatures().onlyDust() + .addGems() + .enforceUnification(), + 4, + TextureSet.SET_DIAMOND, + Collections.singletonList(WerkstoffLoader.Zirconium), + new Pair<>(WerkstoffLoader.Zirconium, 1), + new Pair<>(Materials.Oxygen, 2)); public static final Werkstoff FluorBuergerit = new Werkstoff( - new short[] { 0x20, 0x20, 0x20, 0 }, - "Fluor-Buergerite", - subscriptNumbers("NaFe3Al6(Si6O18)(BO3)3O3F"), - new Werkstoff.Stats().setElektrolysis(false), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems(), - 5, - TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), - new Pair<>(Materials.Sodium, 1), - new Pair<>(Materials.Iron, 3), - new Pair<>(Materials.Aluminium, 6), - new Pair<>(Materials.Silicon, 6), - new Pair<>(Materials.Boron, 3), - new Pair<>(Materials.Oxygen, 30), - new Pair<>(Materials.Fluorine, 1)); + new short[] { 0x20, 0x20, 0x20, 0 }, + "Fluor-Buergerite", + subscriptNumbers("NaFe3Al6(Si6O18)(BO3)3O3F"), + new Werkstoff.Stats().setElektrolysis(false), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems(), + 5, + TextureSet.SET_RUBY, + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), + new Pair<>(Materials.Sodium, 1), + new Pair<>(Materials.Iron, 3), + new Pair<>(Materials.Aluminium, 6), + new Pair<>(Materials.Silicon, 6), + new Pair<>(Materials.Boron, 3), + new Pair<>(Materials.Oxygen, 30), + new Pair<>(Materials.Fluorine, 1)); public static final Werkstoff YttriumOxide = new Werkstoff( - new short[] { 255, 255, 255, 0 }, - "Yttrium Oxide", - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().onlyDust().enforceUnification(), // No autoadd here to gate this material - // by hand - 6, - TextureSet.SET_DULL, - new Pair<>(Materials.Yttrium, 2), - new Pair<>(Materials.Oxygen, 3)); + new short[] { 255, 255, 255, 0 }, + "Yttrium Oxide", + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().onlyDust() + .enforceUnification(), // No autoadd here to gate this material + // by hand + 6, + TextureSet.SET_DULL, + new Pair<>(Materials.Yttrium, 2), + new Pair<>(Materials.Oxygen, 3)); public static final Werkstoff ChromoAluminoPovondrait = new Werkstoff( - new short[] { 0, 0x79, 0x6A, 0 }, - "Chromo-Alumino-Povondraite", - subscriptNumbers("NaCr3(Al4Mg2)(Si6O18)(BO3)3(OH)3O"), - Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND).setElektrolysis(false), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems(), - 7, - TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), - new Pair<>(Materials.Sodium, 1), - new Pair<>(Materials.Chrome, 3), - new Pair<>(Materials.Magnalium, 6), - new Pair<>(Materials.Silicon, 6), - new Pair<>(Materials.Boron, 3), - new Pair<>(Materials.Oxygen, 31), - new Pair<>(Materials.Hydrogen, 3)); + new short[] { 0, 0x79, 0x6A, 0 }, + "Chromo-Alumino-Povondraite", + subscriptNumbers("NaCr3(Al4Mg2)(Si6O18)(BO3)3(OH)3O"), + Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND) + .setElektrolysis(false), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems(), + 7, + TextureSet.SET_RUBY, + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), + new Pair<>(Materials.Sodium, 1), + new Pair<>(Materials.Chrome, 3), + new Pair<>(Materials.Magnalium, 6), + new Pair<>(Materials.Silicon, 6), + new Pair<>(Materials.Boron, 3), + new Pair<>(Materials.Oxygen, 31), + new Pair<>(Materials.Hydrogen, 3)); public static final Werkstoff VanadioOxyDravit = new Werkstoff( - new short[] { 0x60, 0xA0, 0xA0, 0 }, - "Vanadio-Oxy-Dravite", - subscriptNumbers("NaV3(Al4Mg2)(Si6O18)(BO3)3(OH)3O"), - Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND).setElektrolysis(false), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems(), - 8, - TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), - new Pair<>(Materials.Sodium, 1), - new Pair<>(Materials.Vanadium, 3), - new Pair<>(Materials.Magnalium, 6), - new Pair<>(Materials.Silicon, 6), - new Pair<>(Materials.Boron, 3), - new Pair<>(Materials.Oxygen, 31), - new Pair<>(Materials.Hydrogen, 3)); + new short[] { 0x60, 0xA0, 0xA0, 0 }, + "Vanadio-Oxy-Dravite", + subscriptNumbers("NaV3(Al4Mg2)(Si6O18)(BO3)3(OH)3O"), + Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND) + .setElektrolysis(false), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems(), + 8, + TextureSet.SET_RUBY, + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), + new Pair<>(Materials.Sodium, 1), + new Pair<>(Materials.Vanadium, 3), + new Pair<>(Materials.Magnalium, 6), + new Pair<>(Materials.Silicon, 6), + new Pair<>(Materials.Boron, 3), + new Pair<>(Materials.Oxygen, 31), + new Pair<>(Materials.Hydrogen, 3)); public static final Werkstoff Olenit = new Werkstoff( - new short[] { 210, 210, 210, 0 }, - "Olenite", - subscriptNumbers("NaAl3Al6(Si6O18)(BO3)3O3OH"), - Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND).setElektrolysis(false), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems(), - 9, - TextureSet.SET_RUBY, - Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), - new Pair<>(Materials.Sodium, 1), - new Pair<>(Materials.Aluminium, 9), - new Pair<>(Materials.Silicon, 6), - new Pair<>(Materials.Boron, 3), - new Pair<>(Materials.Oxygen, 31), - new Pair<>(Materials.Hydrogen, 1)); + new short[] { 210, 210, 210, 0 }, + "Olenite", + subscriptNumbers("NaAl3Al6(Si6O18)(BO3)3O3OH"), + Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND) + .setElektrolysis(false), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems(), + 9, + TextureSet.SET_RUBY, + Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide), + new Pair<>(Materials.Sodium, 1), + new Pair<>(Materials.Aluminium, 9), + new Pair<>(Materials.Silicon, 6), + new Pair<>(Materials.Boron, 3), + new Pair<>(Materials.Oxygen, 31), + new Pair<>(Materials.Hydrogen, 1)); public static final Werkstoff Arsenopyrite = new Werkstoff( - new short[] { 0xB0, 0xB0, 0xB0, 0 }, - "Arsenopyrite", - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 10, - TextureSet.SET_METALLIC, - Arrays.asList(Materials.Sulfur, Materials.Arsenic, Materials.Iron), - new Pair<>(Materials.Iron, 1), - new Pair<>(Materials.Arsenic, 1), - new Pair<>(Materials.Sulfur, 1)); + new short[] { 0xB0, 0xB0, 0xB0, 0 }, + "Arsenopyrite", + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 10, + TextureSet.SET_METALLIC, + Arrays.asList(Materials.Sulfur, Materials.Arsenic, Materials.Iron), + new Pair<>(Materials.Iron, 1), + new Pair<>(Materials.Arsenic, 1), + new Pair<>(Materials.Sulfur, 1)); public static final Werkstoff Ferberite = new Werkstoff( - new short[] { 0xB0, 0xB0, 0xB0, 0 }, - "Ferberite", - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 11, - TextureSet.SET_METALLIC, - Arrays.asList(Materials.Iron, Materials.Tungsten), - new Pair<>(Materials.Iron, 1), - new Pair<>(Materials.Tungsten, 1), - new Pair<>(Materials.Oxygen, 3)); + new short[] { 0xB0, 0xB0, 0xB0, 0 }, + "Ferberite", + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 11, + TextureSet.SET_METALLIC, + Arrays.asList(Materials.Iron, Materials.Tungsten), + new Pair<>(Materials.Iron, 1), + new Pair<>(Materials.Tungsten, 1), + new Pair<>(Materials.Oxygen, 3)); public static final Werkstoff Loellingit = new Werkstoff( - new short[] { 0xD0, 0xD0, 0xD0, 0 }, - "Loellingite", - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 12, - TextureSet.SET_METALLIC, - Arrays.asList(Materials.Iron, Materials.Arsenic), - new Pair<>(Materials.Iron, 1), - new Pair<>(Materials.Arsenic, 2)); + new short[] { 0xD0, 0xD0, 0xD0, 0 }, + "Loellingite", + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 12, + TextureSet.SET_METALLIC, + Arrays.asList(Materials.Iron, Materials.Arsenic), + new Pair<>(Materials.Iron, 1), + new Pair<>(Materials.Arsenic, 2)); public static final Werkstoff Roquesit = new Werkstoff( - new short[] { 0xA0, 0xA0, 0xA0, 0 }, - "Roquesite", - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 13, - TextureSet.SET_METALLIC, - Arrays.asList(Materials.Copper, Materials.Sulfur), - new Pair<>(Materials.Copper, 1), - new Pair<>(Materials.Indium, 1), - new Pair<>(Materials.Sulfur, 2)); + new short[] { 0xA0, 0xA0, 0xA0, 0 }, + "Roquesite", + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 13, + TextureSet.SET_METALLIC, + Arrays.asList(Materials.Copper, Materials.Sulfur), + new Pair<>(Materials.Copper, 1), + new Pair<>(Materials.Indium, 1), + new Pair<>(Materials.Sulfur, 2)); public static final Werkstoff Bornite = new Werkstoff( - new short[] { 0x97, 0x66, 0x2B, 0 }, - "Bornite", - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 14, - TextureSet.SET_METALLIC, - Arrays.asList(Materials.Copper, Materials.Iron, Materials.Sulfur), - new Pair<>(Materials.Copper, 5), - new Pair<>(Materials.Iron, 1), - new Pair<>(Materials.Sulfur, 4)); + new short[] { 0x97, 0x66, 0x2B, 0 }, + "Bornite", + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 14, + TextureSet.SET_METALLIC, + Arrays.asList(Materials.Copper, Materials.Iron, Materials.Sulfur), + new Pair<>(Materials.Copper, 5), + new Pair<>(Materials.Iron, 1), + new Pair<>(Materials.Sulfur, 4)); public static final Werkstoff Wittichenit = new Werkstoff( - Materials.Copper.mRGBa, - "Wittichenite", - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 15, - TextureSet.SET_METALLIC, - Arrays.asList(Materials.Copper, Materials.Bismuth, Materials.Sulfur), - new Pair<>(Materials.Copper, 5), - new Pair<>(Materials.Bismuth, 1), - new Pair<>(Materials.Sulfur, 4)); + Materials.Copper.mRGBa, + "Wittichenite", + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 15, + TextureSet.SET_METALLIC, + Arrays.asList(Materials.Copper, Materials.Bismuth, Materials.Sulfur), + new Pair<>(Materials.Copper, 5), + new Pair<>(Materials.Bismuth, 1), + new Pair<>(Materials.Sulfur, 4)); public static final Werkstoff Djurleit = new Werkstoff( - new short[] { 0x60, 0x60, 0x60, 0 }, - "Djurleite", - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 16, - TextureSet.SET_METALLIC, - Arrays.asList(Materials.Copper, Materials.Copper, Materials.Sulfur), - new Pair<>(Materials.Copper, 31), - new Pair<>(Materials.Sulfur, 16)); + new short[] { 0x60, 0x60, 0x60, 0 }, + "Djurleite", + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 16, + TextureSet.SET_METALLIC, + Arrays.asList(Materials.Copper, Materials.Copper, Materials.Sulfur), + new Pair<>(Materials.Copper, 31), + new Pair<>(Materials.Sulfur, 16)); public static final Werkstoff Huebnerit = new Werkstoff( - new short[] { 0x80, 0x60, 0x60, 0 }, - "Huebnerite", - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 17, - TextureSet.SET_METALLIC, - Arrays.asList(Materials.Manganese, Materials.Tungsten), - new Pair<>(Materials.Manganese, 1), - new Pair<>(Materials.Tungsten, 1), - new Pair<>(Materials.Oxygen, 3)); + new short[] { 0x80, 0x60, 0x60, 0 }, + "Huebnerite", + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 17, + TextureSet.SET_METALLIC, + Arrays.asList(Materials.Manganese, Materials.Tungsten), + new Pair<>(Materials.Manganese, 1), + new Pair<>(Materials.Tungsten, 1), + new Pair<>(Materials.Oxygen, 3)); public static final Werkstoff Thorianit = new Werkstoff( - new short[] { 0x30, 0x30, 0x30, 0 }, - "Thorianite", - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 18, - TextureSet.SET_METALLIC, - Collections.singletonList(Materials.Thorium), - new Pair<>(Materials.Thorium, 1), - new Pair<>(Materials.Oxygen, 2)); + new short[] { 0x30, 0x30, 0x30, 0 }, + "Thorianite", + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 18, + TextureSet.SET_METALLIC, + Collections.singletonList(Materials.Thorium), + new Pair<>(Materials.Thorium, 1), + new Pair<>(Materials.Oxygen, 2)); public static final Werkstoff RedZircon = new Werkstoff( - new short[] { 195, 19, 19, 0 }, - "Red Zircon", - new Werkstoff.Stats().setElektrolysis(false).setMeltingPoint(2130), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems(), - 19, - TextureSet.SET_GEM_VERTICAL, - Arrays.asList(WerkstoffLoader.Zirconium, Materials.SiliconDioxide), - new Pair<>(WerkstoffLoader.Zirconium, 1), - new Pair<>(Materials.Silicon, 1), - new Pair<>(Materials.Oxygen, 4)); + new short[] { 195, 19, 19, 0 }, + "Red Zircon", + new Werkstoff.Stats().setElektrolysis(false) + .setMeltingPoint(2130), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems(), + 19, + TextureSet.SET_GEM_VERTICAL, + Arrays.asList(WerkstoffLoader.Zirconium, Materials.SiliconDioxide), + new Pair<>(WerkstoffLoader.Zirconium, 1), + new Pair<>(Materials.Silicon, 1), + new Pair<>(Materials.Oxygen, 4)); // GT Enhancements public static final Werkstoff Salt = new Werkstoff( - Materials.Salt.mRGBa, - "Salt", - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addGems().addSifterRecipes(), - 20, - TextureSet.SET_FLINT, - Arrays.asList(Materials.RockSalt, Materials.Borax), - new Pair<>(Materials.Salt, 1)); + Materials.Salt.mRGBa, + "Salt", + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .addGems() + .addSifterRecipes(), + 20, + TextureSet.SET_FLINT, + Arrays.asList(Materials.RockSalt, Materials.Borax), + new Pair<>(Materials.Salt, 1)); public static final Werkstoff Spodumen = new Werkstoff( - Materials.Spodumene.mRGBa, - "Spodumene", - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addGems().addSifterRecipes(), - 21, - TextureSet.SET_FLINT, - Collections.singletonList(Materials.Spodumene), - new Pair<>(Materials.Spodumene, 1)); + Materials.Spodumene.mRGBa, + "Spodumene", + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .addGems() + .addSifterRecipes(), + 21, + TextureSet.SET_FLINT, + Collections.singletonList(Materials.Spodumene), + new Pair<>(Materials.Spodumene, 1)); public static final Werkstoff RockSalt = new Werkstoff( - Materials.RockSalt.mRGBa, - "Rock Salt", - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addGems().addSifterRecipes(), - 22, - TextureSet.SET_FLINT, - Arrays.asList(Materials.RockSalt, Materials.Borax), - new Pair<>(Materials.RockSalt, 1)); + Materials.RockSalt.mRGBa, + "Rock Salt", + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .addGems() + .addSifterRecipes(), + 22, + TextureSet.SET_FLINT, + Arrays.asList(Materials.RockSalt, Materials.Borax), + new Pair<>(Materials.RockSalt, 1)); // More NonGT Stuff public static final Werkstoff Fayalit = new Werkstoff( - new short[] { 50, 50, 50, 0 }, - "Fayalite", - new Werkstoff.Stats().setElektrolysis(false), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems(), - 23, - TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Iron, Materials.SiliconDioxide), - new Pair<>(Materials.Iron, 2), - new Pair<>(Materials.Silicon, 1), - new Pair<>(Materials.Oxygen, 4)); + new short[] { 50, 50, 50, 0 }, + "Fayalite", + new Werkstoff.Stats().setElektrolysis(false), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems(), + 23, + TextureSet.SET_QUARTZ, + Arrays.asList(Materials.Iron, Materials.SiliconDioxide), + new Pair<>(Materials.Iron, 2), + new Pair<>(Materials.Silicon, 1), + new Pair<>(Materials.Oxygen, 4)); public static final Werkstoff Forsterit = new Werkstoff( - new short[] { 255, 255, 255, 0 }, - "Forsterite", - new Werkstoff.Stats().setElektrolysis(false), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems(), - 24, - TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Magnesium, Materials.SiliconDioxide), - new Pair<>(Materials.Magnesium, 2), - new Pair<>(Materials.Silicon, 1), - new Pair<>(Materials.Oxygen, 4)); + new short[] { 255, 255, 255, 0 }, + "Forsterite", + new Werkstoff.Stats().setElektrolysis(false), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems(), + 24, + TextureSet.SET_QUARTZ, + Arrays.asList(Materials.Magnesium, Materials.SiliconDioxide), + new Pair<>(Materials.Magnesium, 2), + new Pair<>(Materials.Silicon, 1), + new Pair<>(Materials.Oxygen, 4)); public static final Werkstoff Hedenbergit = new Werkstoff( - new short[] { 100, 150, 100, 0 }, - "Hedenbergite", - new Werkstoff.Stats().setElektrolysis(false), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems(), - 25, - TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Iron, Materials.Calcium, Materials.SiliconDioxide), - new Pair<>(Materials.Calcium, 1), - new Pair<>(Materials.Iron, 1), - new Pair<>(Materials.Silicon, 2), - new Pair<>(Materials.Oxygen, 6)); + new short[] { 100, 150, 100, 0 }, + "Hedenbergite", + new Werkstoff.Stats().setElektrolysis(false), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems(), + 25, + TextureSet.SET_QUARTZ, + Arrays.asList(Materials.Iron, Materials.Calcium, Materials.SiliconDioxide), + new Pair<>(Materials.Calcium, 1), + new Pair<>(Materials.Iron, 1), + new Pair<>(Materials.Silicon, 2), + new Pair<>(Materials.Oxygen, 6)); public static final Werkstoff DescloiziteZNVO4 = new Werkstoff( - new short[] { 0xBF, 0x18, 0x0F, 0 }, - "Red Descloizite", // Pb(Zn,Cu)[OH|VO4 - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 26, - TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Lead, Materials.Copper, Materials.Vanadium), - new Pair<>(Materials.Lead, 1), - new Pair<>(Materials.Zinc, 1), - new Pair<>(Materials.Vanadium, 1), - new Pair<>(Materials.Oxygen, 4)); + new short[] { 0xBF, 0x18, 0x0F, 0 }, + "Red Descloizite", // Pb(Zn,Cu)[OH|VO4 + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 26, + TextureSet.SET_QUARTZ, + Arrays.asList(Materials.Lead, Materials.Copper, Materials.Vanadium), + new Pair<>(Materials.Lead, 1), + new Pair<>(Materials.Zinc, 1), + new Pair<>(Materials.Vanadium, 1), + new Pair<>(Materials.Oxygen, 4)); public static final Werkstoff DescloiziteCUVO4 = new Werkstoff( - new short[] { 0xf9, 0x6d, 0x18, 0 }, - "Orange Descloizite", // Pb(Zn,Cu)[OH|VO4 - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 27, - TextureSet.SET_QUARTZ, - Arrays.asList(Materials.Lead, Materials.Zinc, Materials.Vanadium), - new Pair<>(Materials.Lead, 1), - new Pair<>(Materials.Copper, 1), - new Pair<>(Materials.Vanadium, 1), - new Pair<>(Materials.Oxygen, 4)); + new short[] { 0xf9, 0x6d, 0x18, 0 }, + "Orange Descloizite", // Pb(Zn,Cu)[OH|VO4 + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 27, + TextureSet.SET_QUARTZ, + Arrays.asList(Materials.Lead, Materials.Zinc, Materials.Vanadium), + new Pair<>(Materials.Lead, 1), + new Pair<>(Materials.Copper, 1), + new Pair<>(Materials.Vanadium, 1), + new Pair<>(Materials.Oxygen, 4)); public static final Werkstoff FuchsitAL = new Werkstoff( - new short[] { 0x4D, 0x7F, 0x64, 0 }, - "Green Fuchsite", - subscriptNumbers("KAl3Si3O10(OH)2"), - new Werkstoff.Stats().setElektrolysis(false), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 28, - TextureSet.SET_METALLIC, - Arrays.asList(Materials.Potassium, Materials.Aluminiumoxide, Materials.SiliconDioxide), - new Pair<>(Materials.Potassium, 1), - new Pair<>(Materials.Aluminium, 3), - new Pair<>(Materials.Silicon, 3), - new Pair<>(Materials.Oxygen, 12), - new Pair<>(Materials.Hydrogen, 2)); + new short[] { 0x4D, 0x7F, 0x64, 0 }, + "Green Fuchsite", + subscriptNumbers("KAl3Si3O10(OH)2"), + new Werkstoff.Stats().setElektrolysis(false), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 28, + TextureSet.SET_METALLIC, + Arrays.asList(Materials.Potassium, Materials.Aluminiumoxide, Materials.SiliconDioxide), + new Pair<>(Materials.Potassium, 1), + new Pair<>(Materials.Aluminium, 3), + new Pair<>(Materials.Silicon, 3), + new Pair<>(Materials.Oxygen, 12), + new Pair<>(Materials.Hydrogen, 2)); public static final Werkstoff FuchsitCR = new Werkstoff( - new short[] { 128, 0, 0, 0 }, - "Red Fuchsite", - subscriptNumbers("KCr3Si3O10(OH)2"), - new Werkstoff.Stats().setElektrolysis(false), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 29, - TextureSet.SET_METALLIC, - Arrays.asList(Materials.Potassium, Materials.Chrome, Materials.SiliconDioxide), - new Pair<>(Materials.Potassium, 1), - new Pair<>(Materials.Chrome, 3), - new Pair<>(Materials.Silicon, 3), - new Pair<>(Materials.Oxygen, 12), - new Pair<>(Materials.Hydrogen, 2)); + new short[] { 128, 0, 0, 0 }, + "Red Fuchsite", + subscriptNumbers("KCr3Si3O10(OH)2"), + new Werkstoff.Stats().setElektrolysis(false), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 29, + TextureSet.SET_METALLIC, + Arrays.asList(Materials.Potassium, Materials.Chrome, Materials.SiliconDioxide), + new Pair<>(Materials.Potassium, 1), + new Pair<>(Materials.Chrome, 3), + new Pair<>(Materials.Silicon, 3), + new Pair<>(Materials.Oxygen, 12), + new Pair<>(Materials.Hydrogen, 2)); public static final Werkstoff Thorium232 = new Werkstoff( - new short[] { 0, 64, 0, 0 }, - "Thorium 232", - superscriptNumbers("Th232"), - new Werkstoff.Stats().setRadioactive(true).setBlastFurnace(true).setMass(232) - .setProtons(Element.Th.mProtons), - Werkstoff.Types.ISOTOPE, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), - 30, - TextureSet.SET_METALLIC + new short[] { 0, 64, 0, 0 }, + "Thorium 232", + superscriptNumbers("Th232"), + new Werkstoff.Stats().setRadioactive(true) + .setBlastFurnace(true) + .setMass(232) + .setProtons(Element.Th.mProtons), + Werkstoff.Types.ISOTOPE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMetalItems() + .enforceUnification(), + 30, + TextureSet.SET_METALLIC // No Byproducts ); public static final Werkstoff BismuthTellurite = new Werkstoff( - new short[] { 32, 72, 32, 0 }, - // Telluride is correct, tellurite is not. - // Only the display name gets renamed to avoid problems in other mods - "Bismuth Telluride", - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addChemicalRecipes(), - 31, - TextureSet.SET_METALLIC, - // No Byproducts - new Pair<>(Materials.Bismuth, 2), - new Pair<>(Materials.Tellurium, 3)); + new short[] { 32, 72, 32, 0 }, + // Telluride is correct, tellurite is not. + // Only the display name gets renamed to avoid problems in other mods + "Bismuth Telluride", + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addChemicalRecipes(), + 31, + TextureSet.SET_METALLIC, + // No Byproducts + new Pair<>(Materials.Bismuth, 2), + new Pair<>(Materials.Tellurium, 3)); public static final Werkstoff Tellurium = new Werkstoff( - new short[] { 0xff, 0xff, 0xff, 0 }, - "Tellurium", - new Werkstoff.Stats(), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().addMetalItems().removePrefix(ore), - 32, - TextureSet.SET_METALLIC, - // No Byproducts - new Pair<>(Materials.Tellurium, 1)); + new short[] { 0xff, 0xff, 0xff, 0 }, + "Tellurium", + new Werkstoff.Stats(), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().addMetalItems() + .removePrefix(ore), + 32, + TextureSet.SET_METALLIC, + // No Byproducts + new Pair<>(Materials.Tellurium, 1)); public static final Werkstoff BismuthHydroBorat = new Werkstoff( - new short[] { 72, 144, 72, 0 }, - "Dibismuthhydroborat", - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addChemicalRecipes(), - 33, - TextureSet.SET_METALLIC, - // No Byproducts - new Pair<>(Materials.Bismuth, 2), - new Pair<>(Materials.Boron, 1), - new Pair<>(Materials.Hydrogen, 1)); + new short[] { 72, 144, 72, 0 }, + "Dibismuthhydroborat", + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addChemicalRecipes(), + 33, + TextureSet.SET_METALLIC, + // No Byproducts + new Pair<>(Materials.Bismuth, 2), + new Pair<>(Materials.Boron, 1), + new Pair<>(Materials.Hydrogen, 1)); public static final Werkstoff ArInGaPhoBiBoTe = new Werkstoff( - new short[] { 36, 36, 36, 0 }, - "Circuit Compound MK3", - new Werkstoff.Stats().setCentrifuge(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMixerRecipes(), - 34, - TextureSet.SET_METALLIC, - // No Byproducts - new Pair<>(Materials.IndiumGalliumPhosphide, 1), - new Pair<>(WerkstoffLoader.BismuthHydroBorat, 3), - new Pair<>(WerkstoffLoader.BismuthTellurite, 2)); + new short[] { 36, 36, 36, 0 }, + "Circuit Compound MK3", + new Werkstoff.Stats().setCentrifuge(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMixerRecipes(), + 34, + TextureSet.SET_METALLIC, + // No Byproducts + new Pair<>(Materials.IndiumGalliumPhosphide, 1), + new Pair<>(WerkstoffLoader.BismuthHydroBorat, 3), + new Pair<>(WerkstoffLoader.BismuthTellurite, 2)); public static final Werkstoff Prasiolite = new Werkstoff( - new short[] { 0xD0, 0xDD, 0x95, 0 }, - "Prasiolite", - new Werkstoff.Stats().setElektrolysis(false).setMeltingPoint(1923), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems(), - 35, - TextureSet.SET_QUARTZ, - // No Byproducts - new Pair<>(Materials.Silicon, 5), - new Pair<>(Materials.Oxygen, 10), - new Pair<>(Materials.Iron, 1)); + new short[] { 0xD0, 0xDD, 0x95, 0 }, + "Prasiolite", + new Werkstoff.Stats().setElektrolysis(false) + .setMeltingPoint(1923), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems(), + 35, + TextureSet.SET_QUARTZ, + // No Byproducts + new Pair<>(Materials.Silicon, 5), + new Pair<>(Materials.Oxygen, 10), + new Pair<>(Materials.Iron, 1)); public static final Werkstoff MagnetoResonaticDust = new Werkstoff( - new short[] { 0xDD, 0x77, 0xDD, 0 }, - "Magneto Resonatic", - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().onlyDust().addMixerRecipes().addGems(), - 36, - TextureSet.SET_MAGNETIC, - // No Byproducts - new Pair<>(WerkstoffLoader.Prasiolite, 3), - new Pair<>(WerkstoffLoader.BismuthTellurite, 4), - new Pair<>(WerkstoffLoader.CubicZirconia, 1), - new Pair<>(Materials.SteelMagnetic, 1)); + new short[] { 0xDD, 0x77, 0xDD, 0 }, + "Magneto Resonatic", + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().onlyDust() + .addMixerRecipes() + .addGems(), + 36, + TextureSet.SET_MAGNETIC, + // No Byproducts + new Pair<>(WerkstoffLoader.Prasiolite, 3), + new Pair<>(WerkstoffLoader.BismuthTellurite, 4), + new Pair<>(WerkstoffLoader.CubicZirconia, 1), + new Pair<>(Materials.SteelMagnetic, 1)); public static final Werkstoff Xenon = new Werkstoff( - new short[] { 0x14, 0x39, 0x7F, 0 }, - "Xenon", - "Xe", - new Werkstoff.Stats().setProtons(54).setMass(131).setGas(true).setEbfGasRecipeTimeMultiplier(0.4d) - .setEbfGasRecipeConsumedAmountMultiplier(0.25d), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().addCells().enforceUnification(), - 37, - TextureSet.SET_FLUID + new short[] { 0x14, 0x39, 0x7F, 0 }, + "Xenon", + "Xe", + new Werkstoff.Stats().setProtons(54) + .setMass(131) + .setGas(true) + .setEbfGasRecipeTimeMultiplier(0.4d) + .setEbfGasRecipeConsumedAmountMultiplier(0.25d), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable() + .addCells() + .enforceUnification(), + 37, + TextureSet.SET_FLUID // No Byproducts // No Ingredients ); public static final Werkstoff Oganesson = new Werkstoff( - new short[] { 0x14, 0x39, 0x7F, 0 }, - "Oganesson", - "Og", - new Werkstoff.Stats().setProtons(118).setMass(294).setGas(true).setEbfGasRecipeTimeMultiplier(0.3d) - .setEbfGasRecipeConsumedAmountMultiplier(0.1d), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().addCells(), - 38, - TextureSet.SET_FLUID + new short[] { 0x14, 0x39, 0x7F, 0 }, + "Oganesson", + "Og", + new Werkstoff.Stats().setProtons(118) + .setMass(294) + .setGas(true) + .setEbfGasRecipeTimeMultiplier(0.3d) + .setEbfGasRecipeConsumedAmountMultiplier(0.1d), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 38, + TextureSet.SET_FLUID // No Byproducts // No Ingredients ); public static final Werkstoff Californium = new Werkstoff( - new short[] { 0xAA, 0xAA, 0xAA, 0 }, - "Californium", - "Cf", - new Werkstoff.Stats().setProtons(98).setMass(251).setBlastFurnace(true).setMeltingPoint(900), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().addMolten().enforceUnification(), - 39, - TextureSet.SET_METALLIC + new short[] { 0xAA, 0xAA, 0xAA, 0 }, + "Californium", + "Cf", + new Werkstoff.Stats().setProtons(98) + .setMass(251) + .setBlastFurnace(true) + .setMeltingPoint(900), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMetalItems() + .addMolten() + .enforceUnification(), + 39, + TextureSet.SET_METALLIC // No Byproducts // No Ingredients ); public static final Werkstoff Calcium = new Werkstoff( - Materials.Calcium.mRGBa, - "Calcium", - "Ca", - new Werkstoff.Stats().setProtons(Element.Ca.mProtons).setMass(Element.Ca.getMass()).setBlastFurnace(true) - .setMeltingPoint(1115).setBoilingPoint(1757), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().addMolten(), - 40, - Materials.Calcium.mIconSet, - // No Byproducts - new Pair<>(Materials.Calcium, 1)); + Materials.Calcium.mRGBa, + "Calcium", + "Ca", + new Werkstoff.Stats().setProtons(Element.Ca.mProtons) + .setMass(Element.Ca.getMass()) + .setBlastFurnace(true) + .setMeltingPoint(1115) + .setBoilingPoint(1757), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMetalItems() + .addMolten(), + 40, + Materials.Calcium.mIconSet, + // No Byproducts + new Pair<>(Materials.Calcium, 1)); public static final Werkstoff Neon = new Werkstoff( - new short[] { 0xff, 0x07, 0x3a }, - "Neon", - "Ne", - new Werkstoff.Stats().setProtons(Element.Ne.mProtons).setMass(Element.Ne.getMass()).setGas(true) - .setEbfGasRecipeTimeMultiplier(0.6d).setEbfGasRecipeConsumedAmountMultiplier(0.55d), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().addCells().enforceUnification(), - 41, - TextureSet.SET_FLUID + new short[] { 0xff, 0x07, 0x3a }, + "Neon", + "Ne", + new Werkstoff.Stats().setProtons(Element.Ne.mProtons) + .setMass(Element.Ne.getMass()) + .setGas(true) + .setEbfGasRecipeTimeMultiplier(0.6d) + .setEbfGasRecipeConsumedAmountMultiplier(0.55d), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable() + .addCells() + .enforceUnification(), + 41, + TextureSet.SET_FLUID // No Byproducts // No Ingredients ); public static final Werkstoff Krypton = new Werkstoff( - new short[] { 0xb1, 0xff, 0x32 }, - "Krypton", - "Kr", - new Werkstoff.Stats().setProtons(Element.Kr.mProtons).setMass(Element.Kr.getMass()).setGas(true) - .setEbfGasRecipeTimeMultiplier(0.5d).setEbfGasRecipeConsumedAmountMultiplier(0.4d), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().addCells().enforceUnification(), - 42, - TextureSet.SET_FLUID + new short[] { 0xb1, 0xff, 0x32 }, + "Krypton", + "Kr", + new Werkstoff.Stats().setProtons(Element.Kr.mProtons) + .setMass(Element.Kr.getMass()) + .setGas(true) + .setEbfGasRecipeTimeMultiplier(0.5d) + .setEbfGasRecipeConsumedAmountMultiplier(0.4d), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable() + .addCells() + .enforceUnification(), + 42, + TextureSet.SET_FLUID // No Byproducts // No Ingredients ); public static final Werkstoff BArTiMaEuSNeK = new Werkstoff( - new short[] { 0x00, 0xff, 0x00 }, - "BArTiMaEuSNeK", - "Are you serious?", - new Werkstoff.Stats().setMeltingPoint(9001).setCentrifuge(true).setBlastFurnace(true) - .setMeltingVoltage(1920), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems().addMetalItems().addMolten(), - 43, - TextureSet.SET_DIAMOND, - Arrays.asList(Materials.Boron, Materials.Titanium, Materials.Europium), - new Pair<>(Materials.Boron, 1), - new Pair<>(Materials.Argon, 1), - new Pair<>(Materials.Titanium, 1), - new Pair<>(Materials.Magic, 1), - new Pair<>(Materials.Europium, 1), - new Pair<>(Materials.Sulfur, 1), - new Pair<>(WerkstoffLoader.Neon, 1), - new Pair<>(Materials.Potassium, 1)); + new short[] { 0x00, 0xff, 0x00 }, + "BArTiMaEuSNeK", + "Are you serious?", + new Werkstoff.Stats().setMeltingPoint(9001) + .setCentrifuge(true) + .setBlastFurnace(true) + .setMeltingVoltage(1920), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems() + .addMetalItems() + .addMolten(), + 43, + TextureSet.SET_DIAMOND, + Arrays.asList(Materials.Boron, Materials.Titanium, Materials.Europium), + new Pair<>(Materials.Boron, 1), + new Pair<>(Materials.Argon, 1), + new Pair<>(Materials.Titanium, 1), + new Pair<>(Materials.Magic, 1), + new Pair<>(Materials.Europium, 1), + new Pair<>(Materials.Sulfur, 1), + new Pair<>(WerkstoffLoader.Neon, 1), + new Pair<>(Materials.Potassium, 1)); public static final Werkstoff PTConcentrate = new Werkstoff( - Materials.Platinum.getRGBA(), - "Platinum Concentrate", - "", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - 44, - TextureSet.SET_FLUID + Materials.Platinum.getRGBA(), + "Platinum Concentrate", + "", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 44, + TextureSet.SET_FLUID // No Byproducts // No Ingredients ); public static final Werkstoff PTSaltCrude = new Werkstoff( - Materials.Platinum.getRGBA(), - "Platinum Salt", - "", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 45, - TextureSet.SET_DULL + Materials.Platinum.getRGBA(), + "Platinum Salt", + "", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 45, + TextureSet.SET_DULL // No Byproducts // No Ingredients ); public static final Werkstoff PTSaltRefined = new Werkstoff( - Materials.Platinum.getRGBA(), - "Refined Platinum Salt", - "", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 46, - TextureSet.SET_METALLIC + Materials.Platinum.getRGBA(), + "Refined Platinum Salt", + "", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 46, + TextureSet.SET_METALLIC // No Byproducts // No Ingredients ); public static final Werkstoff PTMetallicPowder = new Werkstoff( - Materials.Platinum.getRGBA(), - "Platinum Metallic Powder", - "??PtPdIrOsRhRu??", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures(), - 47, - TextureSet.SET_METALLIC, - // No Byproducts - new Pair<>(Materials.Platinum, 1), - new Pair<>(Materials.Stone, 2)); + Materials.Platinum.getRGBA(), + "Platinum Metallic Powder", + "??PtPdIrOsRhRu??", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures(), + 47, + TextureSet.SET_METALLIC, + // No Byproducts + new Pair<>(Materials.Platinum, 1), + new Pair<>(Materials.Stone, 2)); public static final Werkstoff AquaRegia = new Werkstoff( - new short[] { 0xff, 0xb1, 0x32 }, - "Aqua Regia", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - 48, - TextureSet.SET_FLUID, - // No Byproducts - new Pair<>(Materials.DilutedSulfuricAcid, 1), - new Pair<>(Materials.NitricAcid, 1)); + new short[] { 0xff, 0xb1, 0x32 }, + "Aqua Regia", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 48, + TextureSet.SET_FLUID, + // No Byproducts + new Pair<>(Materials.DilutedSulfuricAcid, 1), + new Pair<>(Materials.NitricAcid, 1)); public static final Werkstoff PTResidue = new Werkstoff( - new short[] { 0x64, 0x63, 0x2E }, - "Platinum Residue", - "??IrOsRhRu??", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 49, - TextureSet.SET_ROUGH + new short[] { 0x64, 0x63, 0x2E }, + "Platinum Residue", + "??IrOsRhRu??", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 49, + TextureSet.SET_ROUGH // No Byproducts ); public static final Werkstoff AmmoniumChloride = new Werkstoff( - new short[] { 0xff, 0xff, 0xff }, - "Ammonium Chloride", - subscriptNumbers("NH4Cl"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 50, - TextureSet.SET_FLUID, - // No Byproducts - new Pair<>(Materials.Ammonium, 1), - new Pair<>(Materials.HydrochloricAcid, 1)); + new short[] { 0xff, 0xff, 0xff }, + "Ammonium Chloride", + subscriptNumbers("NH4Cl"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 50, + TextureSet.SET_FLUID, + // No Byproducts + new Pair<>(Materials.Ammonium, 1), + new Pair<>(Materials.HydrochloricAcid, 1)); public static final Werkstoff PTRawPowder = new Werkstoff( - Materials.Platinum.getRGBA(), - "Reprecipitated Platinum", - "PtCl", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 51, - TextureSet.SET_METALLIC + Materials.Platinum.getRGBA(), + "Reprecipitated Platinum", + "PtCl", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 51, + TextureSet.SET_METALLIC // No Byproducts ); public static final Werkstoff PDAmmonia = new Werkstoff( - Materials.Palladium.getRGBA(), - "Palladium Enriched Ammonia", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - 52, - TextureSet.SET_FLUID, - // No Byproducts - new Pair<>(Materials.Ammonium, 1), - new Pair<>(Materials.Palladium, 1)); + Materials.Palladium.getRGBA(), + "Palladium Enriched Ammonia", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 52, + TextureSet.SET_FLUID, + // No Byproducts + new Pair<>(Materials.Ammonium, 1), + new Pair<>(Materials.Palladium, 1)); public static final Werkstoff PDMetallicPowder = new Werkstoff( - Materials.Palladium.getRGBA(), - "Palladium Metallic Powder", - "??Pd??", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures(), - 53, - TextureSet.SET_METALLIC, - // No Byproducts - new Pair<>(Materials.Palladium, 1), - new Pair<>(Materials.Stone, 2)); + Materials.Palladium.getRGBA(), + "Palladium Metallic Powder", + "??Pd??", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures(), + 53, + TextureSet.SET_METALLIC, + // No Byproducts + new Pair<>(Materials.Palladium, 1), + new Pair<>(Materials.Stone, 2)); public static final Werkstoff PDRawPowder = new Werkstoff( - Materials.Palladium.getRGBA(), - "Reprecipitated Palladium", - subscriptNumbers("Pd2NH4"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 54, - TextureSet.SET_METALLIC + Materials.Palladium.getRGBA(), + "Reprecipitated Palladium", + subscriptNumbers("Pd2NH4"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 54, + TextureSet.SET_METALLIC // No Byproducts // No Ingredients ); public static final Werkstoff PDSalt = new Werkstoff( - Materials.Palladium.getRGBA(), - "Palladium Salt", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 55, - TextureSet.SET_METALLIC + Materials.Palladium.getRGBA(), + "Palladium Salt", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 55, + TextureSet.SET_METALLIC // No Byproducts // No Ingredients ); public static final Werkstoff Sodiumformate = new Werkstoff( - new short[] { 0xff, 0xaa, 0xaa }, - "Sodium Formate", - "HCOONa", - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 56, - TextureSet.SET_FLUID, - // No Byproducts - new Pair<>(Materials.SodiumHydroxide, 1), - new Pair<>(Materials.CarbonMonoxide, 1)); + new short[] { 0xff, 0xaa, 0xaa }, + "Sodium Formate", + "HCOONa", + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 56, + TextureSet.SET_FLUID, + // No Byproducts + new Pair<>(Materials.SodiumHydroxide, 1), + new Pair<>(Materials.CarbonMonoxide, 1)); public static final Werkstoff Sodiumsulfate = new Werkstoff( - new short[] { 0xff, 0xff, 0xff }, - "Sodium Sulfate", - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 57, - TextureSet.SET_FLUID, - // No Byproducts - new Pair<>(Materials.Sodium, 2), - new Pair<>(Materials.Sulfur, 1), - new Pair<>(Materials.Oxygen, 4)); + new short[] { 0xff, 0xff, 0xff }, + "Sodium Sulfate", + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 57, + TextureSet.SET_FLUID, + // No Byproducts + new Pair<>(Materials.Sodium, 2), + new Pair<>(Materials.Sulfur, 1), + new Pair<>(Materials.Oxygen, 4)); public static final Werkstoff FormicAcid = new Werkstoff( - new short[] { 0xff, 0xaa, 0x77 }, - "Formic Acid", - subscriptNumbers("CH2O2"), - new Werkstoff.Stats().setElektrolysis(false), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 58, - TextureSet.SET_FLUID, - // No Byproducts - new Pair<>(Materials.Carbon, 1), - new Pair<>(Materials.Hydrogen, 2), - new Pair<>(Materials.Oxygen, 2)); + new short[] { 0xff, 0xaa, 0x77 }, + "Formic Acid", + subscriptNumbers("CH2O2"), + new Werkstoff.Stats().setElektrolysis(false), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 58, + TextureSet.SET_FLUID, + // No Byproducts + new Pair<>(Materials.Carbon, 1), + new Pair<>(Materials.Hydrogen, 2), + new Pair<>(Materials.Oxygen, 2)); public static final Werkstoff PotassiumDisulfate = new Werkstoff( - new short[] { 0xfb, 0xbb, 0x66 }, - "Potassium Disulfate", - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addChemicalRecipes(), - 59, - TextureSet.SET_DULL, - // No Byproducts - new Pair<>(Materials.Potassium, 2), - new Pair<>(Materials.Sulfur, 2), - new Pair<>(Materials.Oxygen, 7)); + new short[] { 0xfb, 0xbb, 0x66 }, + "Potassium Disulfate", + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMolten() + .addChemicalRecipes(), + 59, + TextureSet.SET_DULL, + // No Byproducts + new Pair<>(Materials.Potassium, 2), + new Pair<>(Materials.Sulfur, 2), + new Pair<>(Materials.Oxygen, 7)); public static final Werkstoff LeachResidue = new Werkstoff( - new short[] { 0x64, 0x46, 0x29 }, - "Leach Residue", - "??IrOsRu??", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures(), - 60, - TextureSet.SET_ROUGH + new short[] { 0x64, 0x46, 0x29 }, + "Leach Residue", + "??IrOsRu??", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures(), + 60, + TextureSet.SET_ROUGH // No Byproducts ); public static final Werkstoff RHSulfate = new Werkstoff( - new short[] { 0xee, 0xaa, 0x55 }, - "Rhodium Sulfate", - new Werkstoff.Stats().setGas(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 61, - TextureSet.SET_FLUID + new short[] { 0xee, 0xaa, 0x55 }, + "Rhodium Sulfate", + new Werkstoff.Stats().setGas(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 61, + TextureSet.SET_FLUID // No Byproducts ); public static final Werkstoff RHSulfateSolution = new Werkstoff( - new short[] { 0xff, 0xbb, 0x66 }, - "Rhodium Sulfate Solution", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - 62, - TextureSet.SET_FLUID + new short[] { 0xff, 0xbb, 0x66 }, + "Rhodium Sulfate Solution", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 62, + TextureSet.SET_FLUID // No Byproducts ); public static final Werkstoff CalciumChloride = new Werkstoff( - new short[] { 0xff, 0xff, 0xff }, - "Calcium Chloride", - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addCells(), - 63, - TextureSet.SET_DULL, - new Pair<>(Materials.Calcium, 1), - new Pair<>(Materials.Chlorine, 2) + new short[] { 0xff, 0xff, 0xff }, + "Calcium Chloride", + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addCells(), + 63, + TextureSet.SET_DULL, + new Pair<>(Materials.Calcium, 1), + new Pair<>(Materials.Chlorine, 2) // No Byproducts ); public static final Werkstoff Ruthenium = new Werkstoff( - new short[] { 0x64, 0x64, 0x64 }, - "Ruthenium", - "Ru", - new Werkstoff.Stats().setBlastFurnace(true).setMeltingPoint(2607).setMass(Element.Ru.getMass()) - .setProtons(Element.Ru.mProtons), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().enforceUnification(), - 64, - TextureSet.SET_METALLIC + new short[] { 0x64, 0x64, 0x64 }, + "Ruthenium", + "Ru", + new Werkstoff.Stats().setBlastFurnace(true) + .setMeltingPoint(2607) + .setMass(Element.Ru.getMass()) + .setProtons(Element.Ru.mProtons), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().onlyDust() + .addMolten() + .addMetalItems() + .enforceUnification(), + 64, + TextureSet.SET_METALLIC // No Byproducts ); public static final Werkstoff SodiumRuthenate = new Werkstoff( - new short[] { 0x3a, 0x40, 0xcb }, - "Sodium Ruthenate", - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 65, - TextureSet.SET_SHINY, - new Pair<>(Materials.Sodium, 2), - new Pair<>(Ruthenium, 1), - new Pair<>(Materials.Oxygen, 3) + new short[] { 0x3a, 0x40, 0xcb }, + "Sodium Ruthenate", + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 65, + TextureSet.SET_SHINY, + new Pair<>(Materials.Sodium, 2), + new Pair<>(Ruthenium, 1), + new Pair<>(Materials.Oxygen, 3) // No Byproducts ); public static final Werkstoff RutheniumTetroxide = new Werkstoff( - new short[] { 0xc7, 0xc7, 0xc7 }, - "Ruthenium Tetroxide", - new Werkstoff.Stats().setMeltingPoint(313), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addCells(), - 66, - TextureSet.SET_DULL, - new Pair<>(WerkstoffLoader.Ruthenium, 1), - new Pair<>(Materials.Oxygen, 4) + new short[] { 0xc7, 0xc7, 0xc7 }, + "Ruthenium Tetroxide", + new Werkstoff.Stats().setMeltingPoint(313), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addCells(), + 66, + TextureSet.SET_DULL, + new Pair<>(WerkstoffLoader.Ruthenium, 1), + new Pair<>(Materials.Oxygen, 4) // No Byproducts ); public static final Werkstoff HotRutheniumTetroxideSollution = new Werkstoff( - new short[] { 0xc7, 0xc7, 0xc7 }, - "Hot Ruthenium Tetroxide Solution", - "???", - new Werkstoff.Stats().setGas(true).setMeltingPoint(700), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 67, - TextureSet.SET_FLUID, - new Pair<>(WerkstoffLoader.Ruthenium, 1), - new Pair<>(Materials.Oxygen, 4), - new Pair<>(Materials.Chlorine, 2), - new Pair<>(Materials.Sodium, 2), - new Pair<>(Materials.Water, 2) + new short[] { 0xc7, 0xc7, 0xc7 }, + "Hot Ruthenium Tetroxide Solution", + "???", + new Werkstoff.Stats().setGas(true) + .setMeltingPoint(700), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 67, + TextureSet.SET_FLUID, + new Pair<>(WerkstoffLoader.Ruthenium, 1), + new Pair<>(Materials.Oxygen, 4), + new Pair<>(Materials.Chlorine, 2), + new Pair<>(Materials.Sodium, 2), + new Pair<>(Materials.Water, 2) // No Byproducts ); public static final Werkstoff RutheniumTetroxideSollution = new Werkstoff( - new short[] { 0xc7, 0xc7, 0xc7 }, - "Ruthenium Tetroxide Solution", - "???", - new Werkstoff.Stats().setMeltingPoint(313), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 68, - TextureSet.SET_FLUID, - new Pair<>(Ruthenium, 1), - new Pair<>(Materials.Oxygen, 4), - new Pair<>(Materials.Chlorine, 2), - new Pair<>(Materials.Sodium, 2), - new Pair<>(Materials.Water, 2) + new short[] { 0xc7, 0xc7, 0xc7 }, + "Ruthenium Tetroxide Solution", + "???", + new Werkstoff.Stats().setMeltingPoint(313), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 68, + TextureSet.SET_FLUID, + new Pair<>(Ruthenium, 1), + new Pair<>(Materials.Oxygen, 4), + new Pair<>(Materials.Chlorine, 2), + new Pair<>(Materials.Sodium, 2), + new Pair<>(Materials.Water, 2) // No Byproducts ); public static final Werkstoff IrOsLeachResidue = new Werkstoff( - new short[] { 0x64, 0x46, 0x29 }, - "Rarest Metal Residue", - "??OsIr??", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures(), - 69, - TextureSet.SET_ROUGH, - // No Byproducts - new Pair<>(Materials.Osmiridium, 1), - new Pair<>(Materials.Stone, 2)); + new short[] { 0x64, 0x46, 0x29 }, + "Rarest Metal Residue", + "??OsIr??", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures(), + 69, + TextureSet.SET_ROUGH, + // No Byproducts + new Pair<>(Materials.Osmiridium, 1), + new Pair<>(Materials.Stone, 2)); public static final Werkstoff IrLeachResidue = new Werkstoff( - new short[] { 0x84, 0x66, 0x49 }, - "Iridium Metal Residue", - "??Ir??", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures(), - 70, - TextureSet.SET_ROUGH, - new Pair<>(Materials.Iridium, 1), - new Pair<>(Materials.Stone, 2) + new short[] { 0x84, 0x66, 0x49 }, + "Iridium Metal Residue", + "??Ir??", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures(), + 70, + TextureSet.SET_ROUGH, + new Pair<>(Materials.Iridium, 1), + new Pair<>(Materials.Stone, 2) // No Byproducts ); public static final Werkstoff PGSDResidue = new Werkstoff( - new short[] { 0x84, 0x66, 0x49 }, - "Sludge Dust Residue", - new Werkstoff.Stats().setCentrifuge(true), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 71, - TextureSet.SET_DULL, - new Pair<>(Materials.SiliconDioxide, 3), - new Pair<>(Materials.Gold, 2)); + new short[] { 0x84, 0x66, 0x49 }, + "Sludge Dust Residue", + new Werkstoff.Stats().setCentrifuge(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 71, + TextureSet.SET_DULL, + new Pair<>(Materials.SiliconDioxide, 3), + new Pair<>(Materials.Gold, 2)); public static final Werkstoff AcidicOsmiumSolution = new Werkstoff( - new short[] { 0x84, 0x66, 0x49 }, - "Acidic Osmium Solution", - "???", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - 72, - TextureSet.SET_FLUID, - new Pair<>(Materials.Osmium, 1), - new Pair<>(Materials.HydrochloricAcid, 1)); + new short[] { 0x84, 0x66, 0x49 }, + "Acidic Osmium Solution", + "???", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 72, + TextureSet.SET_FLUID, + new Pair<>(Materials.Osmium, 1), + new Pair<>(Materials.HydrochloricAcid, 1)); public static final Werkstoff IridiumDioxide = new Werkstoff( - new short[] { 0x84, 0x66, 0x49 }, - "Iridium Dioxide", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 73, - TextureSet.SET_FLUID, - new Pair<>(Materials.Iridium, 1), - new Pair<>(Materials.Oxygen, 2)); + new short[] { 0x84, 0x66, 0x49 }, + "Iridium Dioxide", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 73, + TextureSet.SET_FLUID, + new Pair<>(Materials.Iridium, 1), + new Pair<>(Materials.Oxygen, 2)); public static final Werkstoff OsmiumSolution = new Werkstoff( - new short[] { 0x84, 0x66, 0x49 }, - "Osmium Solution", - "???", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - 74, - TextureSet.SET_FLUID, - new Pair<>(Materials.Osmium, 1), - new Pair<>(Materials.Hydrogen, 1)); + new short[] { 0x84, 0x66, 0x49 }, + "Osmium Solution", + "???", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 74, + TextureSet.SET_FLUID, + new Pair<>(Materials.Osmium, 1), + new Pair<>(Materials.Hydrogen, 1)); public static final Werkstoff AcidicIridiumSolution = new Werkstoff( - new short[] { 0x84, 0x66, 0x49 }, - "Acidic Iridium Solution", - "???", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - 75, - TextureSet.SET_FLUID, - new Pair<>(Materials.Iridium, 1), - new Pair<>(Materials.Hydrogen, 1)); + new short[] { 0x84, 0x66, 0x49 }, + "Acidic Iridium Solution", + "???", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 75, + TextureSet.SET_FLUID, + new Pair<>(Materials.Iridium, 1), + new Pair<>(Materials.Hydrogen, 1)); public static final Werkstoff IridiumChloride = new Werkstoff( - new short[] { 0x84, 0x66, 0x49 }, - "Iridium Chloride", - subscriptNumbers("IrCl3"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 76, - TextureSet.SET_LAPIS, - new Pair<>(Materials.Iridium, 1), - new Pair<>(Materials.Chlorine, 3)); + new short[] { 0x84, 0x66, 0x49 }, + "Iridium Chloride", + subscriptNumbers("IrCl3"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 76, + TextureSet.SET_LAPIS, + new Pair<>(Materials.Iridium, 1), + new Pair<>(Materials.Chlorine, 3)); public static final Werkstoff PGSDResidue2 = new Werkstoff( - new short[] { 0x84, 0x66, 0x49 }, - "Metallic Sludge Dust Residue", - new Werkstoff.Stats().setCentrifuge(true), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 77, - TextureSet.SET_DULL, - new Pair<>(Materials.Nickel, 1), - new Pair<>(Materials.Copper, 1)); + new short[] { 0x84, 0x66, 0x49 }, + "Metallic Sludge Dust Residue", + new Werkstoff.Stats().setCentrifuge(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 77, + TextureSet.SET_DULL, + new Pair<>(Materials.Nickel, 1), + new Pair<>(Materials.Copper, 1)); public static final Werkstoff Rhodium = new Werkstoff( - new short[] { 0xF4, 0xF4, 0xF4 }, - "Rhodium", - "Rh", - new Werkstoff.Stats().setProtons(Element.Rh.mProtons).setMass(Element.Rh.getMass()).setBlastFurnace(true) - .setMeltingPoint(2237), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().addMolten().enforceUnification(), - 78, - TextureSet.SET_METALLIC); + new short[] { 0xF4, 0xF4, 0xF4 }, + "Rhodium", + "Rh", + new Werkstoff.Stats().setProtons(Element.Rh.mProtons) + .setMass(Element.Rh.getMass()) + .setBlastFurnace(true) + .setMeltingPoint(2237), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMetalItems() + .addMolten() + .enforceUnification(), + 78, + TextureSet.SET_METALLIC); public static final Werkstoff CrudeRhMetall = new Werkstoff( - new short[] { 0x66, 0x66, 0x66 }, - "Crude Rhodium Metal", - "??Rh??", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures(), - 79, - TextureSet.SET_DULL, - new Pair<>(Rhodium, 1), - new Pair<>(Materials.Stone, 1)); + new short[] { 0x66, 0x66, 0x66 }, + "Crude Rhodium Metal", + "??Rh??", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures(), + 79, + TextureSet.SET_DULL, + new Pair<>(Rhodium, 1), + new Pair<>(Materials.Stone, 1)); public static final Werkstoff RHSalt = new Werkstoff( - new short[] { 0x84, 0x84, 0x84 }, - "Rhodium Salt", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 80, - TextureSet.SET_GEM_VERTICAL); + new short[] { 0x84, 0x84, 0x84 }, + "Rhodium Salt", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 80, + TextureSet.SET_GEM_VERTICAL); public static final Werkstoff RHSaltSolution = new Werkstoff( - new short[] { 0x66, 0x77, 0x88 }, - "Rhodium Salt Solution", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - 81, - TextureSet.SET_FLUID); + new short[] { 0x66, 0x77, 0x88 }, + "Rhodium Salt Solution", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 81, + TextureSet.SET_FLUID); public static final Werkstoff SodiumNitrate = new Werkstoff( - new short[] { 0x84, 0x66, 0x84 }, - "Sodium Nitrate", - subscriptNumbers("NaNO3"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 82, - TextureSet.SET_ROUGH, - new Pair<>(Materials.Sodium, 1), - new Pair<>(Materials.Nitrogen, 1), - new Pair<>(Materials.Oxygen, 3)); + new short[] { 0x84, 0x66, 0x84 }, + "Sodium Nitrate", + subscriptNumbers("NaNO3"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 82, + TextureSet.SET_ROUGH, + new Pair<>(Materials.Sodium, 1), + new Pair<>(Materials.Nitrogen, 1), + new Pair<>(Materials.Oxygen, 3)); public static final Werkstoff RHNitrate = new Werkstoff( - new short[] { 0x77, 0x66, 0x49 }, - "Rhodium Nitrate", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 83, - TextureSet.SET_QUARTZ); + new short[] { 0x77, 0x66, 0x49 }, + "Rhodium Nitrate", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 83, + TextureSet.SET_QUARTZ); public static final Werkstoff ZincSulfate = new Werkstoff( - new short[] { 0x84, 0x66, 0x49 }, - "Zinc Sulfate", - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 84, - TextureSet.SET_QUARTZ, - new Pair<>(Materials.Zinc, 1), - new Pair<>(Materials.Sulfur, 1), - new Pair<>(Materials.Oxygen, 4)); + new short[] { 0x84, 0x66, 0x49 }, + "Zinc Sulfate", + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 84, + TextureSet.SET_QUARTZ, + new Pair<>(Materials.Zinc, 1), + new Pair<>(Materials.Sulfur, 1), + new Pair<>(Materials.Oxygen, 4)); public static final Werkstoff RhFilterCake = new Werkstoff( - new short[] { 0x77, 0x66, 0x49 }, - "Rhodium Filter Cake", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 85, - TextureSet.SET_QUARTZ); + new short[] { 0x77, 0x66, 0x49 }, + "Rhodium Filter Cake", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 85, + TextureSet.SET_QUARTZ); public static final Werkstoff RHFilterCakeSolution = new Werkstoff( - new short[] { 0x66, 0x77, 0x88 }, - "Rhodium Filter Cake Solution", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - 86, - TextureSet.SET_FLUID); + new short[] { 0x66, 0x77, 0x88 }, + "Rhodium Filter Cake Solution", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 86, + TextureSet.SET_FLUID); public static final Werkstoff ReRh = new Werkstoff( - new short[] { 0x77, 0x66, 0x49 }, - "Reprecipitated Rhodium", - subscriptNumbers("Rh2NH4"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 87, - TextureSet.SET_QUARTZ); + new short[] { 0x77, 0x66, 0x49 }, + "Reprecipitated Rhodium", + subscriptNumbers("Rh2NH4"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 87, + TextureSet.SET_QUARTZ); public static final Werkstoff LuVTierMaterial = new Werkstoff( - Materials.Chrome.getRGBA(), - "Rhodium-Plated Palladium", - new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(4500) - .setMeltingVoltage(480), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems() - .addMixerRecipes((short) 1).addSimpleMetalWorkingItems().addCraftingMetalWorkingItems() - .addMultipleIngotMetalWorkingItems(), - 88, - TextureSet.SET_METALLIC, - new Pair<>(Materials.Palladium, 3), - new Pair<>(WerkstoffLoader.Rhodium, 1)); + Materials.Chrome.getRGBA(), + "Rhodium-Plated Palladium", + new Werkstoff.Stats().setCentrifuge(true) + .setBlastFurnace(true) + .setMeltingPoint(4500) + .setMeltingVoltage(480), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMolten() + .addMetalItems() + .addMixerRecipes((short) 1) + .addSimpleMetalWorkingItems() + .addCraftingMetalWorkingItems() + .addMultipleIngotMetalWorkingItems(), + 88, + TextureSet.SET_METALLIC, + new Pair<>(Materials.Palladium, 3), + new Pair<>(WerkstoffLoader.Rhodium, 1)); public static final Werkstoff Tiberium = new Werkstoff( - new short[] { 0x22, 0xEE, 0x22 }, - "Tiberium", - "Tr", - new Werkstoff.Stats().setProtons(123).setMass(326).setBlastFurnace(true).setMeltingPoint(1800) - .setRadioactive(true).setToxic(true), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().addGems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems(), - 89, - TextureSet.SET_DIAMOND); + new short[] { 0x22, 0xEE, 0x22 }, + "Tiberium", + "Tr", + new Werkstoff.Stats().setProtons(123) + .setMass(326) + .setBlastFurnace(true) + .setMeltingPoint(1800) + .setRadioactive(true) + .setToxic(true), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().addGems() + .addCraftingMetalWorkingItems() + .addSimpleMetalWorkingItems(), + 89, + TextureSet.SET_DIAMOND); public static final Werkstoff Ruridit = new Werkstoff( - new short[] { 0xA4, 0xA4, 0xA4 }, - "Ruridit", - new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(4500) - .setMeltingVoltage(480), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems() - .addMixerRecipes((short) 1).addSimpleMetalWorkingItems().addCraftingMetalWorkingItems() - .addMultipleIngotMetalWorkingItems(), - 90, - TextureSet.SET_METALLIC, - new Pair<>(WerkstoffLoader.Ruthenium, 2), - new Pair<>(Materials.Iridium, 1)); + new short[] { 0xA4, 0xA4, 0xA4 }, + "Ruridit", + new Werkstoff.Stats().setCentrifuge(true) + .setBlastFurnace(true) + .setMeltingPoint(4500) + .setMeltingVoltage(480), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMolten() + .addMetalItems() + .addMixerRecipes((short) 1) + .addSimpleMetalWorkingItems() + .addCraftingMetalWorkingItems() + .addMultipleIngotMetalWorkingItems(), + 90, + TextureSet.SET_METALLIC, + new Pair<>(WerkstoffLoader.Ruthenium, 2), + new Pair<>(Materials.Iridium, 1)); public static final Werkstoff Fluorspar = new Werkstoff( - new short[] { 185, 69, 251 }, - "Fluorspar", - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().addGems(), - 91, - TextureSet.SET_GEM_VERTICAL, - new Pair<>(Materials.Calcium, 1), - new Pair<>(Materials.Fluorine, 2)); + new short[] { 185, 69, 251 }, + "Fluorspar", + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().addGems(), + 91, + TextureSet.SET_GEM_VERTICAL, + new Pair<>(Materials.Calcium, 1), + new Pair<>(Materials.Fluorine, 2)); public static final Werkstoff HDCS = new Werkstoff( - new short[] { 0x33, 0x44, 0x33 }, - "High Durability Compound Steel", - new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(9000) - .setMeltingVoltage(7680), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems().addMixerRecipes() - .addSimpleMetalWorkingItems().addCraftingMetalWorkingItems().addMultipleIngotMetalWorkingItems(), - 92, - TextureSet.SET_SHINY, - new Pair<>(Materials.TungstenSteel, 12), - new Pair<>(Materials.HSSE, 9), - new Pair<>(Materials.HSSG, 6), - new Pair<>(WerkstoffLoader.Ruridit, 3), - new Pair<>(WerkstoffLoader.MagnetoResonaticDust, 2), - new Pair<>(Materials.Plutonium, 1)); + new short[] { 0x33, 0x44, 0x33 }, + "High Durability Compound Steel", + new Werkstoff.Stats().setCentrifuge(true) + .setBlastFurnace(true) + .setMeltingPoint(9000) + .setMeltingVoltage(7680), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMolten() + .addMetalItems() + .addMixerRecipes() + .addSimpleMetalWorkingItems() + .addCraftingMetalWorkingItems() + .addMultipleIngotMetalWorkingItems(), + 92, + TextureSet.SET_SHINY, + new Pair<>(Materials.TungstenSteel, 12), + new Pair<>(Materials.HSSE, 9), + new Pair<>(Materials.HSSG, 6), + new Pair<>(WerkstoffLoader.Ruridit, 3), + new Pair<>(WerkstoffLoader.MagnetoResonaticDust, 2), + new Pair<>(Materials.Plutonium, 1)); public static final Werkstoff Atheneite = new Werkstoff( - new short[] { 175, 175, 175 }, - "Atheneite", - subscriptNumbers("(Pd,Hg)3As"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 93, - TextureSet.SET_SHINY, - new Pair<>(WerkstoffLoader.PDMetallicPowder, 3), - new Pair<>(Materials.Mercury, 3), - new Pair<>(Materials.Arsenic, 1)); + new short[] { 175, 175, 175 }, + "Atheneite", + subscriptNumbers("(Pd,Hg)3As"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 93, + TextureSet.SET_SHINY, + new Pair<>(WerkstoffLoader.PDMetallicPowder, 3), + new Pair<>(Materials.Mercury, 3), + new Pair<>(Materials.Arsenic, 1)); public static final Werkstoff Temagamite = new Werkstoff( - new short[] { 245, 245, 245 }, - "Temagamite", - subscriptNumbers("Pd3HgTe"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 94, - TextureSet.SET_ROUGH, - new Pair<>(WerkstoffLoader.PDMetallicPowder, 3), - new Pair<>(Materials.Mercury, 1), - new Pair<>(Materials.Tellurium, 1)); + new short[] { 245, 245, 245 }, + "Temagamite", + subscriptNumbers("Pd3HgTe"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 94, + TextureSet.SET_ROUGH, + new Pair<>(WerkstoffLoader.PDMetallicPowder, 3), + new Pair<>(Materials.Mercury, 1), + new Pair<>(Materials.Tellurium, 1)); public static final Werkstoff Terlinguaite = new Werkstoff( - new short[] { 245, 245, 245 }, - "Terlinguaite", - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures(), - 95, - TextureSet.SET_GEM_HORIZONTAL, - new Pair<>(Materials.Mercury, 2), - new Pair<>(Materials.Chlorine, 1), - new Pair<>(Materials.Oxygen, 1)); + new short[] { 245, 245, 245 }, + "Terlinguaite", + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures(), + 95, + TextureSet.SET_GEM_HORIZONTAL, + new Pair<>(Materials.Mercury, 2), + new Pair<>(Materials.Chlorine, 1), + new Pair<>(Materials.Oxygen, 1)); public static final Werkstoff AdemicSteel = new Werkstoff( - new short[] { 0xcc, 0xcc, 0xcc }, - "Ademic Steel", - "The break in the line", - new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setDurOverride(6144).setMeltingPoint(1800) - .setSpeedOverride(12).setQualityOverride((byte) 4).setMeltingVoltage(1920), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().onlyDust().addMetalItems().addCraftingMetalWorkingItems().addMolten() - .addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems(), - 96, - TextureSet.SET_METALLIC, - new Pair<>(Materials.Steel, 2), - new Pair<>(Materials.VanadiumSteel, 1), - new Pair<>(Materials.DamascusSteel, 1), - new Pair<>(Materials.Carbon, 4)); + new short[] { 0xcc, 0xcc, 0xcc }, + "Ademic Steel", + "The break in the line", + new Werkstoff.Stats().setCentrifuge(true) + .setBlastFurnace(true) + .setDurOverride(6144) + .setMeltingPoint(1800) + .setSpeedOverride(12) + .setQualityOverride((byte) 4) + .setMeltingVoltage(1920), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().onlyDust() + .addMetalItems() + .addCraftingMetalWorkingItems() + .addMolten() + .addSimpleMetalWorkingItems() + .addMultipleIngotMetalWorkingItems(), + 96, + TextureSet.SET_METALLIC, + new Pair<>(Materials.Steel, 2), + new Pair<>(Materials.VanadiumSteel, 1), + new Pair<>(Materials.DamascusSteel, 1), + new Pair<>(Materials.Carbon, 4)); public static final Werkstoff RawAdemicSteel = new Werkstoff( - new short[] { 0xed, 0xed, 0xed }, - "Raw Ademic Steel", - new Werkstoff.Stats().setCentrifuge(true), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().onlyDust().addMixerRecipes(), - 97, - TextureSet.SET_ROUGH, - new Pair<>(Materials.Steel, 2), - new Pair<>(Materials.VanadiumSteel, 1), - new Pair<>(Materials.DamascusSteel, 1)); + new short[] { 0xed, 0xed, 0xed }, + "Raw Ademic Steel", + new Werkstoff.Stats().setCentrifuge(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().onlyDust() + .addMixerRecipes(), + 97, + TextureSet.SET_ROUGH, + new Pair<>(Materials.Steel, 2), + new Pair<>(Materials.VanadiumSteel, 1), + new Pair<>(Materials.DamascusSteel, 1)); public static final Werkstoff HexafluorosilicicAcid = new Werkstoff( - new short[] { 0x2c, 0x70, 0xb5 }, - "Hexafluorosilicic Acid", - subscriptNumbers("H2SiF6"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 98, - TextureSet.SET_FLUID, - new Pair<>(Materials.Hydrogen, 2), - new Pair<>(Materials.Silicon, 1), - new Pair<>(Materials.Fluorine, 6)); + new short[] { 0x2c, 0x70, 0xb5 }, + "Hexafluorosilicic Acid", + subscriptNumbers("H2SiF6"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 98, + TextureSet.SET_FLUID, + new Pair<>(Materials.Hydrogen, 2), + new Pair<>(Materials.Silicon, 1), + new Pair<>(Materials.Fluorine, 6)); public static final Werkstoff Potassiumfluorosilicate = new Werkstoff( - new short[] { 0x2e, 0x97, 0xb2 }, - "Potassiumfluorosilicate", - subscriptNumbers("K2SiF6"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 99, - TextureSet.SET_SHINY, - new Pair<>(Materials.Potassium, 2), - new Pair<>(Materials.Silicon, 1), - new Pair<>(Materials.Fluorine, 6)); + new short[] { 0x2e, 0x97, 0xb2 }, + "Potassiumfluorosilicate", + subscriptNumbers("K2SiF6"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 99, + TextureSet.SET_SHINY, + new Pair<>(Materials.Potassium, 2), + new Pair<>(Materials.Silicon, 1), + new Pair<>(Materials.Fluorine, 6)); public static final Werkstoff Alumina = new Werkstoff( - new short[] { 0xa0, 0xad, 0xb1 }, - "Alumina", - subscriptNumbers("Al2O3"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 100, - TextureSet.SET_DULL); + new short[] { 0xa0, 0xad, 0xb1 }, + "Alumina", + subscriptNumbers("Al2O3"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 100, + TextureSet.SET_DULL); public static final Werkstoff PotassiumCarbonate = new Werkstoff( - new short[] { 0x7b, 0x96, 0x4f }, - "Potassium Carbonate", - subscriptNumbers("K2CO3"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 101, - TextureSet.SET_DULL, - new Pair<>(Materials.Potassium, 2), - new Pair<>(Materials.Carbon, 1), - new Pair<>(Materials.Oxygen, 3)); + new short[] { 0x7b, 0x96, 0x4f }, + "Potassium Carbonate", + subscriptNumbers("K2CO3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 101, + TextureSet.SET_DULL, + new Pair<>(Materials.Potassium, 2), + new Pair<>(Materials.Carbon, 1), + new Pair<>(Materials.Oxygen, 3)); public static final Werkstoff RawFluorophlogopite = new Werkstoff( - new short[] { 0x36, 0x51, 0x0b }, - "Raw Fluorophlogopite", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - 102, - TextureSet.SET_DULL); + new short[] { 0x36, 0x51, 0x0b }, + "Raw Fluorophlogopite", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust(), + 102, + TextureSet.SET_DULL); public static final Werkstoff HotFluorophlogopite = new Werkstoff( - new short[] { 0xbf, 0xd3, 0x55 }, - "Unformed Fluorophlogopite", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - 103, - TextureSet.SET_FLUID); + new short[] { 0xbf, 0xd3, 0x55 }, + "Unformed Fluorophlogopite", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .addCells(), + 103, + TextureSet.SET_FLUID); public static final Werkstoff Fluorophlogopite = new Werkstoff( - new short[] { 0xbf, 0xd3, 0x55 }, - "Fluorophlogopite", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems(), - 104, - TextureSet.SET_SHINY); + new short[] { 0xbf, 0xd3, 0x55 }, + "Fluorophlogopite", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable() + .onlyDust() + .addMetalItems(), + 104, + TextureSet.SET_SHINY); public static HashMap<OrePrefixes, BW_MetaGenerated_Items> items = new HashMap<>(); public static HashBiMap<Werkstoff, Fluid> fluids = HashBiMap.create(); @@ -1457,15 +1625,15 @@ public class WerkstoffLoader { ItemStack stack = getCorrespondingItemStackUnsafe(orePrefixes, werkstoff, amount); if (stack != null) return stack; MainMod.LOGGER.catching( - Level.ERROR, - new Exception( - "NO SUCH ITEM! " + orePrefixes - + werkstoff.getVarName() - + " If you encounter this as a user, make sure to contact the authors of the pack/the mods you're playing! " - + "If you are a Developer, you forgot to enable " - + orePrefixes - + " OrePrefix for Werkstoff " - + werkstoff.getDefaultName())); + Level.ERROR, + new Exception( + "NO SUCH ITEM! " + orePrefixes + + werkstoff.getVarName() + + " If you encounter this as a user, make sure to contact the authors of the pack/the mods you're playing! " + + "If you are a Developer, you forgot to enable " + + orePrefixes + + " OrePrefix for Werkstoff " + + werkstoff.getDefaultName())); return new ItemStack(WerkstoffLoader.items.get(orePrefixes), amount, werkstoff.getmID()).copy(); } @@ -1479,12 +1647,12 @@ public class WerkstoffLoader { runAdditionalOreDict(); long timepost = System.nanoTime(); MainMod.LOGGER.info( - "Making Meta Items for BW Materials took " + (timepost - timepre) - + "ns/" - + (timepost - timepre) / 1000000 - + "ms/" - + (timepost - timepre) / 1000000000 - + "s!"); + "Making Meta Items for BW Materials took " + (timepost - timepre) + + "ns/" + + (timepost - timepre) / 1000000 + + "ms/" + + (timepost - timepre) / 1000000000 + + "s!"); } public static void run() { @@ -1492,24 +1660,24 @@ public class WerkstoffLoader { MainMod.LOGGER.info("Loading Processing Recipes for BW Materials"); long timepre = System.nanoTime(); ProgressManager.ProgressBar progressBar = ProgressManager - .push("Register BW Materials", Werkstoff.werkstoffHashSet.size() + 1); + .push("Register BW Materials", Werkstoff.werkstoffHashSet.size() + 1); DebugLog.log("Loading Recipes" + (System.nanoTime() - timepre)); Integer[] clsArr = {}; int size = 0; if (BetterLoadingScreen.isModLoaded()) clsArr = CLSCompat.initCls(); IWerkstoffRunnable[] werkstoffRunnables = { new ToolLoader(), new DustLoader(), new GemLoader(), - new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new OreLoader(), - new RawOreLoader(), new CrushedLoader(), new CraftingMaterialLoader(), new CellLoader(), - new MoltenCellLoader(), new MultipleMetalLoader(), new MetalLoader(), new BlockLoader() }; + new SimpleMetalLoader(), new CasingLoader(), new AspectLoader(), new OreLoader(), new RawOreLoader(), + new CrushedLoader(), new CraftingMaterialLoader(), new CellLoader(), new MoltenCellLoader(), + new MultipleMetalLoader(), new MetalLoader(), new BlockLoader() }; long timepreone = 0; for (Werkstoff werkstoff : Werkstoff.werkstoffHashSet) { timepreone = System.nanoTime(); DebugLog.log( - "Werkstoff is null or id < 0 ? " + (werkstoff == null || werkstoff.getmID() < 0) - + " " - + (System.nanoTime() - timepreone)); + "Werkstoff is null or id < 0 ? " + (werkstoff == null || werkstoff.getmID() < 0) + + " " + + (System.nanoTime() - timepreone)); if (werkstoff == null || werkstoff.getmID() < 0) { progressBar.step(""); continue; @@ -1517,7 +1685,8 @@ public class WerkstoffLoader { if (BetterLoadingScreen.isModLoaded()) size = CLSCompat.invokeStepSize(werkstoff, clsArr, size); DebugLog.log("Werkstoff: " + werkstoff.getDefaultName() + " " + (System.nanoTime() - timepreone)); for (IWerkstoffRunnable runnable : werkstoffRunnables) { - String loaderName = runnable.getClass().getSimpleName(); + String loaderName = runnable.getClass() + .getSimpleName(); DebugLog.log(loaderName + " started " + (System.nanoTime() - timepreone)); runnable.run(werkstoff); DebugLog.log(loaderName + " done " + (System.nanoTime() - timepreone)); @@ -1537,21 +1706,24 @@ public class WerkstoffLoader { ProgressManager.pop(progressBar); long timepost = System.nanoTime(); MainMod.LOGGER.info( - "Loading Processing Recipes for BW Materials took " + (timepost - timepre) - + "ns/" - + (timepost - timepre) / 1000000 - + "ms/" - + (timepost - timepre) / 1000000000 - + "s!"); + "Loading Processing Recipes for BW Materials took " + (timepost - timepre) + + "ns/" + + (timepost - timepre) / 1000000 + + "ms/" + + (timepost - timepre) / 1000000000 + + "s!"); registered = true; } } @SuppressWarnings("unchecked") private static void addSubTags() { - WerkstoffLoader.CubicZirconia.getStats().setDurOverride(Materials.Diamond.mDurability); - WerkstoffLoader.HDCS.getStats().setSpeedOverride(Materials.HSSS.mToolSpeed); - WerkstoffLoader.HDCS.getStats().setDurMod(10f); + WerkstoffLoader.CubicZirconia.getStats() + .setDurOverride(Materials.Diamond.mDurability); + WerkstoffLoader.HDCS.getStats() + .setSpeedOverride(Materials.HSSS.mToolSpeed); + WerkstoffLoader.HDCS.getStats() + .setDurMod(10f); Materials.Helium.add(WerkstoffLoader.NOBLE_GAS); WerkstoffLoader.Neon.add(WerkstoffLoader.NOBLE_GAS); Materials.Argon.add(WerkstoffLoader.NOBLE_GAS); @@ -1589,7 +1761,9 @@ public class WerkstoffLoader { Materials.Calcium.mToolQuality = WerkstoffLoader.Calcium.getToolQuality(); for (Werkstoff W : Werkstoff.werkstoffHashSet) { - for (Pair<ISubTagContainer, Integer> pair : W.getContents().getValue().toArray(new Pair[0])) { + for (Pair<ISubTagContainer, Integer> pair : W.getContents() + .getValue() + .toArray(new Pair[0])) { if (pair.getKey() instanceof Materials && pair.getKey() == Materials.Neodymium) { W.add(SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM); @@ -1624,10 +1798,15 @@ public class WerkstoffLoader { if (!FluidRegistry.isFluidRegistered(werkstoff.getDefaultName())) { DebugLog.log("Adding new Fluid: " + werkstoff.getDefaultName()); Fluid fluid = GT_FluidFactory.builder(werkstoff.getDefaultName()) - .withLocalizedName(werkstoff.getDefaultName()) - .withStateAndTemperature(werkstoff.getStats().getFluidState(), 300) - .withColorRGBA(werkstoff.getRGBA()).withTextureName("autogenerated").buildAndRegister() - .asFluid(); + .withLocalizedName(werkstoff.getDefaultName()) + .withStateAndTemperature( + werkstoff.getStats() + .getFluidState(), + 300) + .withColorRGBA(werkstoff.getRGBA()) + .withTextureName("autogenerated") + .buildAndRegister() + .asFluid(); WerkstoffLoader.fluids.put(werkstoff, fluid); } else { WerkstoffLoader.fluids.put(werkstoff, FluidRegistry.getFluid(werkstoff.getDefaultName())); @@ -1637,30 +1816,34 @@ public class WerkstoffLoader { if (!FluidRegistry.isFluidRegistered("molten." + werkstoff.getDefaultName())) { DebugLog.log("Adding new Molten: " + werkstoff.getDefaultName()); Fluid fluid = GT_FluidFactory.builder("molten." + werkstoff.getDefaultName()) - .withLocalizedName("Molten " + werkstoff.getDefaultName()) - .withStateAndTemperature( - FluidState.MOLTEN, - werkstoff.getStats().getMeltingPoint() > 0 ? werkstoff.getStats().getMeltingPoint() - : 300) - .withColorRGBA(werkstoff.getRGBA()).withTextureName("molten.autogenerated") - .buildAndRegister().asFluid(); + .withLocalizedName("Molten " + werkstoff.getDefaultName()) + .withStateAndTemperature( + FluidState.MOLTEN, + werkstoff.getStats() + .getMeltingPoint() > 0 ? werkstoff.getStats() + .getMeltingPoint() : 300) + .withColorRGBA(werkstoff.getRGBA()) + .withTextureName("molten.autogenerated") + .buildAndRegister() + .asFluid(); WerkstoffLoader.molten.put(werkstoff, fluid); } else { WerkstoffLoader.molten.put(werkstoff, FluidRegistry.getFluid(werkstoff.getDefaultName())); } } for (OrePrefixes p : values()) if (Materials.get(werkstoff.getDefaultName()) != null - && Materials.get(werkstoff.getDefaultName()).mMetaItemSubID != -1 - && (werkstoff.getGenerationFeatures().toGenerate & p.mMaterialGenerationBits) != 0 - && OreDictHandler.getItemStack(werkstoff.getDefaultName(), p, 1) != null) { - DebugLog.log( - "Found: " + p - + werkstoff.getVarName() - + " in GT material system, disable and reroute my Items to that, also add a Tooltip."); - werkstoff.getGenerationFeatures().setBlacklist(p); - } + && Materials.get(werkstoff.getDefaultName()).mMetaItemSubID != -1 + && (werkstoff.getGenerationFeatures().toGenerate & p.mMaterialGenerationBits) != 0 + && OreDictHandler.getItemStack(werkstoff.getDefaultName(), p, 1) != null) { + DebugLog.log( + "Found: " + p + + werkstoff.getVarName() + + " in GT material system, disable and reroute my Items to that, also add a Tooltip."); + werkstoff.getGenerationFeatures() + .setBlacklist(p); + } WerkstoffLoader.toGenerateGlobal = WerkstoffLoader.toGenerateGlobal - | werkstoff.getGenerationFeatures().toGenerate; + | werkstoff.getGenerationFeatures().toGenerate; } DebugLog.log("GlobalGeneration: " + WerkstoffLoader.toGenerateGlobal); if ((WerkstoffLoader.toGenerateGlobal & 0b1) != 0) { @@ -1700,7 +1883,7 @@ public class WerkstoffLoader { if ((WerkstoffLoader.toGenerateGlobal & 0b1000000) != 0) { WerkstoffLoader.items.put(OrePrefixes.cellMolten, new BW_MetaGenerated_Items(OrePrefixes.cellMolten)); if (Forestry.isModLoaded()) WerkstoffLoader.items - .put(OrePrefixes.capsuleMolten, new BW_MetaGenerated_Items(OrePrefixes.capsuleMolten)); + .put(OrePrefixes.capsuleMolten, new BW_MetaGenerated_Items(OrePrefixes.capsuleMolten)); } if ((WerkstoffLoader.toGenerateGlobal & 0b10000000) != 0) { WerkstoffLoader.items.put(plate, new BW_MetaGenerated_Items(plate)); @@ -1747,41 +1930,40 @@ public class WerkstoffLoader { GameRegistry.registerTileEntity(BW_MetaGeneratedSmallOreTE.class, "bw.blockoresSmallTE"); GameRegistry.registerTileEntity(BW_MetaGenerated_WerkstoffBlock_TE.class, "bw.werkstoffblockTE"); GameRegistry.registerTileEntity(BW_MetaGeneratedBlocks_Casing_TE.class, "bw.werkstoffblockcasingTE"); - GameRegistry.registerTileEntity( - BW_MetaGeneratedBlocks_CasingAdvanced_TE.class, - "bw.werkstoffblockscasingadvancedTE"); + GameRegistry + .registerTileEntity(BW_MetaGeneratedBlocks_CasingAdvanced_TE.class, "bw.werkstoffblockscasingadvancedTE"); WerkstoffLoader.BWOres = new BW_MetaGenerated_Ores(Material.rock, BW_MetaGeneratedOreTE.class, "bw.blockores"); WerkstoffLoader.BWSmallOres = new BW_MetaGenerated_SmallOres( - Material.rock, - BW_MetaGeneratedSmallOreTE.class, - "bw.blockoresSmall"); + Material.rock, + BW_MetaGeneratedSmallOreTE.class, + "bw.blockoresSmall"); WerkstoffLoader.BWBlocks = new BW_MetaGenerated_WerkstoffBlocks( - Material.iron, - BW_MetaGenerated_WerkstoffBlock_TE.class, - "bw.werkstoffblocks"); + Material.iron, + BW_MetaGenerated_WerkstoffBlock_TE.class, + "bw.werkstoffblocks"); WerkstoffLoader.BWBlockCasings = new BW_MetaGeneratedBlocks_Casing( - Material.iron, - BW_MetaGeneratedBlocks_Casing_TE.class, - "bw.werkstoffblockscasing", - OrePrefixes.blockCasing); + Material.iron, + BW_MetaGeneratedBlocks_Casing_TE.class, + "bw.werkstoffblockscasing", + OrePrefixes.blockCasing); WerkstoffLoader.BWBlockCasingsAdvanced = new BW_MetaGeneratedBlocks_Casing( - Material.iron, - BW_MetaGeneratedBlocks_CasingAdvanced_TE.class, - "bw.werkstoffblockscasingadvanced", - OrePrefixes.blockCasingAdvanced); + Material.iron, + BW_MetaGeneratedBlocks_CasingAdvanced_TE.class, + "bw.werkstoffblockscasingadvanced", + OrePrefixes.blockCasingAdvanced); GameRegistry.registerBlock(WerkstoffLoader.BWOres, BW_MetaGeneratedBlock_Item.class, "bw.blockores.01"); GameRegistry.registerBlock(WerkstoffLoader.BWSmallOres, BW_MetaGeneratedBlock_Item.class, "bw.blockores.02"); GameRegistry.registerBlock(WerkstoffLoader.BWBlocks, BW_MetaGeneratedBlock_Item.class, "bw.werkstoffblocks.01"); if (!ConfigHandler.disableBoltedBlocksCasing) GameRegistry.registerBlock( - WerkstoffLoader.BWBlockCasings, - BW_MetaGeneratedBlock_Item.class, - "bw.werkstoffblockscasing.01"); + WerkstoffLoader.BWBlockCasings, + BW_MetaGeneratedBlock_Item.class, + "bw.werkstoffblockscasing.01"); if (!ConfigHandler.disableReboltedBlocksCasing) GameRegistry.registerBlock( - WerkstoffLoader.BWBlockCasingsAdvanced, - BW_MetaGeneratedBlock_Item.class, - "bw.werkstoffblockscasingadvanced.01"); + WerkstoffLoader.BWBlockCasingsAdvanced, + BW_MetaGeneratedBlock_Item.class, + "bw.werkstoffblockscasingadvanced.01"); GTMetaItemEnhancer.addAdditionalOreDictToForestry(); GTMetaItemEnhancer.init(); @@ -1789,7 +1971,7 @@ public class WerkstoffLoader { private static void runGTItemDataRegistrator() { IWerkstoffRunnable[] registrations = { new BridgeMaterialsLoader(), new AssociationLoader(), - new CasingRegistrator() }; + new CasingRegistrator() }; for (Werkstoff werkstoff : Werkstoff.werkstoffHashSet) { for (IWerkstoffRunnable registration : registrations) { registration.run(werkstoff); @@ -1800,27 +1982,24 @@ public class WerkstoffLoader { } public static void addVanillaCasingsToGTOreDictUnificator() { - GT_OreDictUnificator.addAssociation( - OrePrefixes.blockCasing, - Materials.Aluminium, - ItemList.Casing_FrostProof.get(1L), - false); GT_OreDictUnificator - .addAssociation(OrePrefixes.blockCasing, Materials.Nickel, ItemList.Casing_HeatProof.get(1L), false); + .addAssociation(OrePrefixes.blockCasing, Materials.Aluminium, ItemList.Casing_FrostProof.get(1L), false); GT_OreDictUnificator - .addAssociation(OrePrefixes.blockCasing, Materials.Lead, ItemList.Casing_RadiationProof.get(1L), false); + .addAssociation(OrePrefixes.blockCasing, Materials.Nickel, ItemList.Casing_HeatProof.get(1L), false); GT_OreDictUnificator - .addAssociation(OrePrefixes.blockCasing, Materials.Steel, ItemList.Casing_SolidSteel.get(1L), false); + .addAssociation(OrePrefixes.blockCasing, Materials.Lead, ItemList.Casing_RadiationProof.get(1L), false); + GT_OreDictUnificator + .addAssociation(OrePrefixes.blockCasing, Materials.Steel, ItemList.Casing_SolidSteel.get(1L), false); GT_OreDictUnificator.addAssociation( - OrePrefixes.blockCasing, - Materials.TungstenSteel, - ItemList.Casing_RobustTungstenSteel.get(1L), - false); + OrePrefixes.blockCasing, + Materials.TungstenSteel, + ItemList.Casing_RobustTungstenSteel.get(1L), + false); GT_OreDictUnificator.addAssociation( - OrePrefixes.blockCasing, - Materials.Polytetrafluoroethylene, - ItemList.Casing_Chemically_Inert.get(1L), - false); + OrePrefixes.blockCasing, + Materials.Polytetrafluoroethylene, + ItemList.Casing_Chemically_Inert.get(1L), + false); } /** @@ -1861,7 +2040,8 @@ public class WerkstoffLoader { public static void removeIC2Recipes() { try { Set<Map.Entry<IRecipeInput, RecipeOutput>> remset = new HashSet<>(); - for (Map.Entry<IRecipeInput, RecipeOutput> curr : Recipes.macerator.getRecipes().entrySet()) { + for (Map.Entry<IRecipeInput, RecipeOutput> curr : Recipes.macerator.getRecipes() + .entrySet()) { if (curr.getKey() instanceof RecipeInputOreDict) { if ("oreNULL".equalsIgnoreCase(((RecipeInputOreDict) curr.getKey()).input)) { remset.add(curr); @@ -1871,7 +2051,9 @@ public class WerkstoffLoader { } } } - Recipes.macerator.getRecipes().entrySet().removeAll(remset); + Recipes.macerator.getRecipes() + .entrySet() + .removeAll(remset); } catch (Exception e) { e.printStackTrace(); } @@ -1882,24 +2064,27 @@ public class WerkstoffLoader { if (werkstoff.hasItemType(ore)) { GT_OreDictUnificator.registerOre(ore + werkstoff.getVarName(), werkstoff.get(ore)); GT_OreDictUnificator.registerOre(oreSmall + werkstoff.getVarName(), werkstoff.get(oreSmall)); - werkstoff.getADDITIONAL_OREDICT().forEach(e -> OreDictionary.registerOre(ore + e, werkstoff.get(ore))); werkstoff.getADDITIONAL_OREDICT() - .forEach(e -> OreDictionary.registerOre(oreSmall + e, werkstoff.get(oreSmall))); + .forEach(e -> OreDictionary.registerOre(ore + e, werkstoff.get(ore))); + werkstoff.getADDITIONAL_OREDICT() + .forEach(e -> OreDictionary.registerOre(oreSmall + e, werkstoff.get(oreSmall))); } if (werkstoff.hasItemType(gem)) OreDictionary.registerOre( - "craftingLens" + BW_ColorUtil.getDyeFromColor(werkstoff.getRGBA()).mName.replace(" ", ""), - werkstoff.get(lens)); + "craftingLens" + BW_ColorUtil.getDyeFromColor(werkstoff.getRGBA()).mName.replace(" ", ""), + werkstoff.get(lens)); if (werkstoff.hasItemType(gem) || werkstoff.hasItemType(ingot)) { GT_OreDictUnificator.registerOre(block + werkstoff.getVarName(), werkstoff.get(block)); werkstoff.getADDITIONAL_OREDICT() - .forEach(e -> OreDictionary.registerOre(block + e, werkstoff.get(block))); + .forEach(e -> OreDictionary.registerOre(block + e, werkstoff.get(block))); } - werkstoff.getADDITIONAL_OREDICT().forEach( - s -> ENABLED_ORE_PREFIXES.stream().filter(o -> Objects.nonNull(werkstoff.get(o))) - .forEach(od -> OreDictionary.registerOre(od + s, werkstoff.get(od)))); + werkstoff.getADDITIONAL_OREDICT() + .forEach( + s -> ENABLED_ORE_PREFIXES.stream() + .filter(o -> Objects.nonNull(werkstoff.get(o))) + .forEach(od -> OreDictionary.registerOre(od + s, werkstoff.get(od)))); } GT_OreDictUnificator.registerOre("craftingIndustrialDiamond", WerkstoffLoader.CubicZirconia.get(gemExquisite)); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AddSomeRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AddSomeRecipes.java index 5d1644ae2b..c31013eb78 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AddSomeRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AddSomeRecipes.java @@ -33,52 +33,64 @@ public class AddSomeRecipes implements Runnable { public void run() { - GT_Values.RA.stdBuilder().itemInputs(BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1)) - .itemOutputs( - WerkstoffLoader.Zirconium.get(dust), - WerkstoffLoader.Zirconium.get(dust), - WerkstoffLoader.Tiberium.get(dustSmall, 2), - WerkstoffLoader.Zirconium.get(dust, 2), - GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 8L), - GT_OreDictUnificator.get(dust, Materials.Platinum, 1L)) - .outputChances(100_00, 50_00, 50_00, 25_00, 100_00, 100_00) - .fluidOutputs(WerkstoffLoader.Xenon.getFluidOrGas(1)).duration(12 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_EV).addTo(centrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1)) + .itemOutputs( + WerkstoffLoader.Zirconium.get(dust), + WerkstoffLoader.Zirconium.get(dust), + WerkstoffLoader.Tiberium.get(dustSmall, 2), + WerkstoffLoader.Zirconium.get(dust, 2), + GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 8L), + GT_OreDictUnificator.get(dust, Materials.Platinum, 1L)) + .outputChances(100_00, 50_00, 50_00, 25_00, 100_00, 100_00) + .fluidOutputs(WerkstoffLoader.Xenon.getFluidOrGas(1)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1)) - .itemOutputs( - WerkstoffLoader.Zirconium.get(dust, 2), - WerkstoffLoader.Zirconium.get(dust, 2), - WerkstoffLoader.Tiberium.get(dust), - WerkstoffLoader.Zirconium.get(dust, 4), - GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 18L), - GT_OreDictUnificator.get(dust, Materials.Platinum, 2L)) - .outputChances(100_00, 50_00, 50_00, 25_00, 100_00, 100_00) - .fluidOutputs(WerkstoffLoader.Xenon.getFluidOrGas(2)).duration(12 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_EV).addTo(centrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1)) + .itemOutputs( + WerkstoffLoader.Zirconium.get(dust, 2), + WerkstoffLoader.Zirconium.get(dust, 2), + WerkstoffLoader.Tiberium.get(dust), + WerkstoffLoader.Zirconium.get(dust, 4), + GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 18L), + GT_OreDictUnificator.get(dust, Materials.Platinum, 2L)) + .outputChances(100_00, 50_00, 50_00, 25_00, 100_00, 100_00) + .fluidOutputs(WerkstoffLoader.Xenon.getFluidOrGas(2)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1)) - .itemOutputs( - WerkstoffLoader.Zirconium.get(dust, 4), - WerkstoffLoader.Zirconium.get(dust, 4), - WerkstoffLoader.Tiberium.get(dust, 2), - WerkstoffLoader.Zirconium.get(dust, 8), - GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 38L), - GT_OreDictUnificator.get(dust, Materials.Platinum, 4L)) - .outputChances(100_00, 50_00, 50_00, 25_00, 100_00, 100_00) - .fluidOutputs(WerkstoffLoader.Xenon.getFluidOrGas(4)).duration(50 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(centrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1)) + .itemOutputs( + WerkstoffLoader.Zirconium.get(dust, 4), + WerkstoffLoader.Zirconium.get(dust, 4), + WerkstoffLoader.Tiberium.get(dust, 2), + WerkstoffLoader.Zirconium.get(dust, 8), + GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 38L), + GT_OreDictUnificator.get(dust, Materials.Platinum, 4L)) + .outputChances(100_00, 50_00, 50_00, 25_00, 100_00, 100_00) + .fluidOutputs(WerkstoffLoader.Xenon.getFluidOrGas(4)) + .duration(50 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1)) - .itemOutputs( - ItemList.Depleted_Naquadah_4.get(8), - WerkstoffLoader.Zirconium.get(dust, 64), - WerkstoffLoader.Zirconium.get(dust, 64), - GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 64L), - GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 64L), - GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 48L)) - .outputChances(100_00, 50_00, 50_00, 100_00, 100_00, 100_00).duration(1 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(centrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1)) + .itemOutputs( + ItemList.Depleted_Naquadah_4.get(8), + WerkstoffLoader.Zirconium.get(dust, 64), + WerkstoffLoader.Zirconium.get(dust, 64), + GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 64L), + GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 64L), + GT_OreDictUnificator.get(dust, Materials.TungstenSteel, 48L)) + .outputChances(100_00, 50_00, 50_00, 100_00, 100_00, 100_00) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(centrifugeRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java index d08ae368bf..3638536ca6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java @@ -83,26 +83,28 @@ public class AdditionalRecipes { if (ConfigHandler.BioLab) { FluidStack[] dnaFluid = { Gendustry.isModLoaded() ? FluidRegistry.getFluidStack("liquiddna", 1000) - : Materials.Biomass.getFluid(1000L) }; + : Materials.Biomass.getFluid(1000L) }; for (ItemStack stack : BioItemList.getAllPetriDishes()) { - BioData DNA = BioData.getBioDataFromNBTTag(stack.getTagCompound().getCompoundTag("DNA")); + BioData DNA = BioData.getBioDataFromNBTTag( + stack.getTagCompound() + .getCompoundTag("DNA")); if (DNA != null) { ItemStack Detergent = BioItemList.getOther(1); ItemStack DNAFlask = BioItemList.getDNASampleFlask(null); ItemStack EthanolCell = Materials.Ethanol.getCells(1); BartWorksRecipeMaps.bioLabRecipes.addFakeRecipe( - false, - new ItemStack[] { stack, DNAFlask, Detergent, EthanolCell }, - new ItemStack[] { BioItemList.getDNASampleFlask(BioDNA.convertDataToDNA(DNA)), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L) }, - BioItemList.mBioLabParts[0], - new int[] { DNA.getChance(), 10000 }, - new FluidStack[] { FluidRegistry.getFluidStack("ic2distilledwater", 1000) }, - null, - 500, - BW_Util.getMachineVoltageFromTier(3 + DNA.getTier()), - BW_Util.STANDART); + false, + new ItemStack[] { stack, DNAFlask, Detergent, EthanolCell }, + new ItemStack[] { BioItemList.getDNASampleFlask(BioDNA.convertDataToDNA(DNA)), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L) }, + BioItemList.mBioLabParts[0], + new int[] { DNA.getChance(), 10000 }, + new FluidStack[] { FluidRegistry.getFluidStack("ic2distilledwater", 1000) }, + null, + 500, + BW_Util.getMachineVoltageFromTier(3 + DNA.getTier()), + BW_Util.STANDART); } } @@ -115,17 +117,17 @@ public class AdditionalRecipes { Behaviour_DataOrb.setDataName(Outp, DNA.getName()); BartWorksRecipeMaps.bioLabRecipes.addFakeRecipe( - false, - new ItemStack[] { stack, FluidLoader.BioLabFluidCells[0], FluidLoader.BioLabFluidCells[3], - ItemList.Tool_DataOrb.get(1L) }, - new ItemStack[] { Outp, ItemList.Cell_Empty.get(2L) }, - BioItemList.mBioLabParts[1], - new int[] { DNA.getChance(), 10000 }, - dnaFluid, - null, - 500, - BW_Util.getMachineVoltageFromTier(4 + DNA.getTier()), - BW_Util.STANDART); + false, + new ItemStack[] { stack, FluidLoader.BioLabFluidCells[0], FluidLoader.BioLabFluidCells[3], + ItemList.Tool_DataOrb.get(1L) }, + new ItemStack[] { Outp, ItemList.Cell_Empty.get(2L) }, + BioItemList.mBioLabParts[1], + new int[] { DNA.getChance(), 10000 }, + dnaFluid, + null, + 500, + BW_Util.getMachineVoltageFromTier(4 + DNA.getTier()), + BW_Util.STANDART); } } @@ -141,37 +143,41 @@ public class AdditionalRecipes { Behaviour_DataOrb.setDataName(inp2, BioCultureLoader.BIO_DATA_BETA_LACMATASE.getName()); BartWorksRecipeMaps.bioLabRecipes.addFakeRecipe( - false, - new ItemStack[] { FluidLoader.BioLabFluidCells[1], BioItemList.getPlasmidCell(null), inp, - inp2 }, - new ItemStack[] { stack, ItemList.Cell_Empty.get(1L) }, - BioItemList.mBioLabParts[2], - new int[] { DNA.getChance(), 10000 }, - dnaFluid, - null, - 500, - BW_Util.getMachineVoltageFromTier(4 + DNA.getTier()), - BW_Util.STANDART); + false, + new ItemStack[] { FluidLoader.BioLabFluidCells[1], BioItemList.getPlasmidCell(null), inp, + inp2 }, + new ItemStack[] { stack, ItemList.Cell_Empty.get(1L) }, + BioItemList.mBioLabParts[2], + new int[] { DNA.getChance(), 10000 }, + dnaFluid, + null, + 500, + BW_Util.getMachineVoltageFromTier(4 + DNA.getTier()), + BW_Util.STANDART); } } for (ItemStack stack : BioItemList.getAllPetriDishes()) { - BioData DNA = BioData.getBioDataFromNBTTag(stack.getTagCompound().getCompoundTag("DNA")); - BioData Plasmid = BioData.getBioDataFromNBTTag(stack.getTagCompound().getCompoundTag("Plasmid")); + BioData DNA = BioData.getBioDataFromNBTTag( + stack.getTagCompound() + .getCompoundTag("DNA")); + BioData Plasmid = BioData.getBioDataFromNBTTag( + stack.getTagCompound() + .getCompoundTag("Plasmid")); if (!Objects.equals(DNA.getName(), Plasmid.getName())) { BartWorksRecipeMaps.bioLabRecipes.addFakeRecipe( - true, - new ItemStack[] { BioItemList.getPetriDish(BioCulture.getBioCulture(DNA.getName())), - BioItemList.getPlasmidCell(BioPlasmid.convertDataToPlasmid(Plasmid)), - FluidLoader.BioLabFluidCells[2], }, - new ItemStack[] { stack, ItemList.Cell_Empty.get(1L) }, - BioItemList.mBioLabParts[3], - new int[] { Plasmid.getChance(), 10000 }, - new FluidStack[] { FluidRegistry.getFluidStack("ic2distilledwater", 1000) }, - null, - 500, - (int) TierEU.RECIPE_LuV, - BW_Util.STANDART); + true, + new ItemStack[] { BioItemList.getPetriDish(BioCulture.getBioCulture(DNA.getName())), + BioItemList.getPlasmidCell(BioPlasmid.convertDataToPlasmid(Plasmid)), + FluidLoader.BioLabFluidCells[2], }, + new ItemStack[] { stack, ItemList.Cell_Empty.get(1L) }, + BioItemList.mBioLabParts[3], + new int[] { Plasmid.getChance(), 10000 }, + new FluidStack[] { FluidRegistry.getFluidStack("ic2distilledwater", 1000) }, + null, + 500, + (int) TierEU.RECIPE_LuV, + BW_Util.STANDART); } } @@ -180,452 +186,485 @@ public class AdditionalRecipes { Behaviour_DataOrb.setDataName(Outp, "Any DNA"); // Clonal Cellular Synthesis- [Liquid DNA] + Medium Petri Dish + Plasma Membrane + Stem Cells + Genome Data BartWorksRecipeMaps.bioLabRecipes.addFakeRecipe( - false, - new ItemStack[] { BioItemList.getPetriDish(null), BioItemList.getOther(4), - ItemList.Circuit_Chip_Stemcell.get(2L), Outp }, - new ItemStack[] { - BioItemList.getPetriDish(null).setStackDisplayName("The Culture made from DNA"), }, - BioItemList.mBioLabParts[4], - new int[] { 7500, 10000 }, - new FluidStack[] { new FluidStack(dnaFluid[0].getFluid(), 8000) }, - null, - 500, - (int) TierEU.RECIPE_LuV, - BW_Util.STANDART); + false, + new ItemStack[] { BioItemList.getPetriDish(null), BioItemList.getOther(4), + ItemList.Circuit_Chip_Stemcell.get(2L), Outp }, + new ItemStack[] { BioItemList.getPetriDish(null) + .setStackDisplayName("The Culture made from DNA"), }, + BioItemList.mBioLabParts[4], + new int[] { 7500, 10000 }, + new FluidStack[] { new FluidStack(dnaFluid[0].getFluid(), 8000) }, + null, + 500, + (int) TierEU.RECIPE_LuV, + BW_Util.STANDART); FluidStack[] easyFluids = { Materials.Water.getFluid(1000L), - FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; + FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; for (FluidStack fluidStack : easyFluids) { for (BioCulture bioCulture : BioCulture.BIO_CULTURE_ARRAY_LIST) { if (bioCulture.isBreedable() && bioCulture.getTier() == 0) { BartWorksRecipeMaps.bacterialVatRecipes.addRecipe( - // boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, - // int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, - // int aEUt, int aSpecialValue - new GT_Recipe( - true, - new ItemStack[] { GT_Utility.getIntegratedCircuit(1), - new ItemStack(Items.sugar, 64) }, - null, - BioItemList.getPetriDish(bioCulture), - null, - new FluidStack[] { fluidStack }, - new FluidStack[] { new FluidStack(bioCulture.getFluid(), 10) }, - 1000, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART)); + // boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, + // int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, + // int aEUt, int aSpecialValue + new GT_Recipe( + true, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), new ItemStack(Items.sugar, 64) }, + null, + BioItemList.getPetriDish(bioCulture), + null, + new FluidStack[] { fluidStack }, + new FluidStack[] { new FluidStack(bioCulture.getFluid(), 10) }, + 1000, + (int) TierEU.RECIPE_HV, + BW_Util.STANDART)); // aOptimize, aInputs, aOutputs, aSpecialItems, aChances, aFluidInputs, aFluidOutputs, // aDuration, aEUt, aSpecialValue BartWorksRecipeMaps.bioLabRecipes.addRecipe( - new GT_Recipe( - false, - new ItemStack[] { BioItemList.getPetriDish(null), - fluidStack.equals(Materials.Water.getFluid(1000L)) - ? Materials.Water.getCells(1) - : GT_Utility.getContainersFromFluid( - GT_ModHandler.getDistilledWater(1000)).get(0) }, - new ItemStack[] { BioItemList.getPetriDish(bioCulture), - Materials.Empty.getCells(1) }, - null, - new int[] { bioCulture.getChance(), 10000 }, - new FluidStack[] { new FluidStack(bioCulture.getFluid(), 1000) }, - null, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART)); + new GT_Recipe( + false, + new ItemStack[] { BioItemList.getPetriDish(null), + fluidStack.equals(Materials.Water.getFluid(1000L)) ? Materials.Water.getCells(1) + : GT_Utility.getContainersFromFluid(GT_ModHandler.getDistilledWater(1000)) + .get(0) }, + new ItemStack[] { BioItemList.getPetriDish(bioCulture), Materials.Empty.getCells(1) }, + null, + new int[] { bioCulture.getChance(), 10000 }, + new FluidStack[] { new FluidStack(bioCulture.getFluid(), 1000) }, + null, + 500, + (int) TierEU.RECIPE_HV, + BW_Util.STANDART)); } } } } List<Pair<Materials, Integer>> liquidFuels = Arrays.asList( - ImmutablePair.of(Materials.PhosphoricAcid, 36), - ImmutablePair.of(Materials.DilutedHydrochloricAcid, 14), - ImmutablePair.of(Materials.HypochlorousAcid, 30), - ImmutablePair.of(Materials.HydrofluoricAcid, 40), - ImmutablePair.of(Materials.HydrochloricAcid, 28), - ImmutablePair.of(Materials.NitricAcid, 24), - ImmutablePair.of(Materials.Mercury, 32), - ImmutablePair.of(Materials.DilutedSulfuricAcid, 9), - ImmutablePair.of(Materials.SulfuricAcid, 18), - ImmutablePair.of(Materials.AceticAcid, 11), - ImmutablePair.of(WerkstoffLoader.FormicAcid.getBridgeMaterial(), 40)); + ImmutablePair.of(Materials.PhosphoricAcid, 36), + ImmutablePair.of(Materials.DilutedHydrochloricAcid, 14), + ImmutablePair.of(Materials.HypochlorousAcid, 30), + ImmutablePair.of(Materials.HydrofluoricAcid, 40), + ImmutablePair.of(Materials.HydrochloricAcid, 28), + ImmutablePair.of(Materials.NitricAcid, 24), + ImmutablePair.of(Materials.Mercury, 32), + ImmutablePair.of(Materials.DilutedSulfuricAcid, 9), + ImmutablePair.of(Materials.SulfuricAcid, 18), + ImmutablePair.of(Materials.AceticAcid, 11), + ImmutablePair.of(WerkstoffLoader.FormicAcid.getBridgeMaterial(), 40)); for (Pair<Materials, Integer> fuel : liquidFuels) { - GT_Values.RA.stdBuilder().itemInputs(fuel.getLeft().getCells(1)).itemOutputs(Materials.Empty.getCells(1)) - .metadata(GT_RecipeConstants.FUEL_VALUE, fuel.getRight()).addTo(BartWorksRecipeMaps.acidGenFuels); - } - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Redstone, 1)) - .itemOutputs(Materials.Empty.getCells(1)).metadata(GT_RecipeConstants.FUEL_VALUE, 10) + GT_Values.RA.stdBuilder() + .itemInputs( + fuel.getLeft() + .getCells(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .metadata(GT_RecipeConstants.FUEL_VALUE, fuel.getRight()) .addTo(BartWorksRecipeMaps.acidGenFuels); + } + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Redstone, 1)) + .itemOutputs(Materials.Empty.getCells(1)) + .metadata(GT_RecipeConstants.FUEL_VALUE, 10) + .addTo(BartWorksRecipeMaps.acidGenFuels); } @SuppressWarnings("deprecation") public static void run() { runBWRecipes(); GT_Values.RA.addImplosionRecipe( - WerkstoffLoader.RawAdemicSteel.get(dust), - 4, - WerkstoffLoader.AdemicSteel.get(dust), - null); + WerkstoffLoader.RawAdemicSteel.get(dust), + 4, + WerkstoffLoader.AdemicSteel.get(dust), + null); // Thorium/Yttrium Glas GT_Values.RA.addBlastRecipe( - WerkstoffLoader.YttriumOxide.get(dustSmall, 2), - WerkstoffLoader.Thorianit.get(dustSmall, 2), - Materials.Glass.getMolten(144), - null, - new ItemStack(ItemRegistry.bw_glasses[0], 1, 12), - null, - 800, - (int) TierEU.RECIPE_IV, - 3663); + WerkstoffLoader.YttriumOxide.get(dustSmall, 2), + WerkstoffLoader.Thorianit.get(dustSmall, 2), + Materials.Glass.getMolten(144), + null, + new ItemStack(ItemRegistry.bw_glasses[0], 1, 12), + null, + 800, + (int) TierEU.RECIPE_IV, + 3663); // Thorianite recipes - GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.Thorianit.get(crushedPurified)) - .itemOutputs( - WerkstoffLoader.Thorianit.get(dust), - WerkstoffLoader.Thorianit.get(dust), - WerkstoffLoader.Thorianit.get(dust), - Materials.Thorium.getDust(1), - Materials.Thorium.getDust(1), - WerkstoffLoader.Thorium232.get(dust)) - .outputChances(7000, 1300, 700, 600, 300, 100).duration(20 * SECONDS).eut((int) TierEU.RECIPE_IV) - .addTo(sifterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffLoader.Thorianit.get(crushedPurified)) + .itemOutputs( + WerkstoffLoader.Thorianit.get(dust), + WerkstoffLoader.Thorianit.get(dust), + WerkstoffLoader.Thorianit.get(dust), + Materials.Thorium.getDust(1), + Materials.Thorium.getDust(1), + WerkstoffLoader.Thorium232.get(dust)) + .outputChances(7000, 1300, 700, 600, 300, 100) + .duration(20 * SECONDS) + .eut((int) TierEU.RECIPE_IV) + .addTo(sifterRecipes); // 3ThO2 + 4Al = 3Th + 2Al2O3 GT_Values.RA.addChemicalRecipe( - WerkstoffLoader.Thorianit.get(dust, 9), - Materials.Aluminium.getDust(4), - null, - null, - Materials.Thorium.getDust(3), - Materials.Aluminiumoxide.getDust(10), - 1000); + WerkstoffLoader.Thorianit.get(dust, 9), + Materials.Aluminium.getDust(4), + null, + null, + Materials.Thorium.getDust(3), + Materials.Aluminiumoxide.getDust(10), + 1000); // ThO2 + 2Mg = Th + 2MgO GT_Values.RA.addChemicalRecipe( - WerkstoffLoader.Thorianit.get(dust, 3), - Materials.Magnesium.getDust(2), - null, - null, - Materials.Thorium.getDust(1), - Materials.Magnesia.getDust(4), - 1000); + WerkstoffLoader.Thorianit.get(dust, 3), + Materials.Magnesium.getDust(2), + null, + null, + Materials.Thorium.getDust(1), + Materials.Magnesia.getDust(4), + 1000); GT_Values.RA.addChemicalRecipe( - WerkstoffLoader.Thorianit.get(crushed), - ItemList.Crop_Drop_Thorium.get(9), - Materials.Water.getFluid(1000), - Materials.Thorium.getMolten(144), - WerkstoffLoader.Thorianit.get(crushedPurified, 4), - 96, - 24); + WerkstoffLoader.Thorianit.get(crushed), + ItemList.Crop_Drop_Thorium.get(9), + Materials.Water.getFluid(1000), + Materials.Thorium.getMolten(144), + WerkstoffLoader.Thorianit.get(crushedPurified, 4), + 96, + 24); // Prasiolite GT_Values.RA.addBlastRecipe( - GT_OreDictUnificator.get(dust, Materials.Quartzite, 40L), - Materials.Amethyst.getDust(10), - GT_Values.NF, - GT_Values.NF, - WerkstoffLoader.Prasiolite.get(OrePrefixes.gemFlawed, 20), - GT_Values.NI, - 800, - (int) TierEU.RECIPE_MV, - 500); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(dust, Materials.Quartzite, 40L)) - .itemOutputs(Materials.Amethyst.getDust(10)).duration(40 * SECONDS).eut(0).metadata(ADDITIVE_AMOUNT, 6) - .addTo(primitiveBlastRecipes); + GT_OreDictUnificator.get(dust, Materials.Quartzite, 40L), + Materials.Amethyst.getDust(10), + GT_Values.NF, + GT_Values.NF, + WerkstoffLoader.Prasiolite.get(OrePrefixes.gemFlawed, 20), + GT_Values.NI, + 800, + (int) TierEU.RECIPE_MV, + 500); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(dust, Materials.Quartzite, 40L)) + .itemOutputs(Materials.Amethyst.getDust(10)) + .duration(40 * SECONDS) + .eut(0) + .metadata(ADDITIVE_AMOUNT, 6) + .addTo(primitiveBlastRecipes); // Cubic Circonia // 2Y + 3O = Y2O3 GT_Values.RA.addChemicalRecipe( - Materials.Yttrium.getDust(2), - GT_Utility.getIntegratedCircuit(5), - Materials.Oxygen.getGas(3000), - GT_Values.NF, - WerkstoffLoader.YttriumOxide.get(dust, 5), - 4096, - (int) TierEU.RECIPE_LV); + Materials.Yttrium.getDust(2), + GT_Utility.getIntegratedCircuit(5), + Materials.Oxygen.getGas(3000), + GT_Values.NF, + WerkstoffLoader.YttriumOxide.get(dust, 5), + 4096, + (int) TierEU.RECIPE_LV); // Zr + 2O =Y22O3= ZrO2 RecipeMaps.blastFurnaceRecipes.addRecipe( - false, - new ItemStack[] { WerkstoffLoader.Zirconium.get(dust, 10), WerkstoffLoader.YttriumOxide.get(dust, 0) }, - new ItemStack[] { WerkstoffLoader.CubicZirconia.get(gemFlawed, 40) }, - null, - null, - new FluidStack[] { Materials.Oxygen.getGas(20000) }, - null, - 57600, - (int) TierEU.RECIPE_HV, - 2953); + false, + new ItemStack[] { WerkstoffLoader.Zirconium.get(dust, 10), WerkstoffLoader.YttriumOxide.get(dust, 0) }, + new ItemStack[] { WerkstoffLoader.CubicZirconia.get(gemFlawed, 40) }, + null, + null, + new FluidStack[] { Materials.Oxygen.getGas(20000) }, + null, + 57600, + (int) TierEU.RECIPE_HV, + 2953); // Tellurium GT_Values.RA.addBlastRecipe( - GT_OreDictUnificator.get(crushed, Materials.Lead, 10L), - GT_Utility.getIntegratedCircuit(17), - GT_Values.NF, - GT_Values.NF, - Materials.Lead.getIngots(10), - Materials.Tellurium.getNuggets(20), - 800, - (int) TierEU.RECIPE_MV, - 722); + GT_OreDictUnificator.get(crushed, Materials.Lead, 10L), + GT_Utility.getIntegratedCircuit(17), + GT_Values.NF, + GT_Values.NF, + Materials.Lead.getIngots(10), + Materials.Tellurium.getNuggets(20), + 800, + (int) TierEU.RECIPE_MV, + 722); GT_Values.RA.addFusionReactorRecipe( - Materials.Plutonium.getMolten(48), - Materials.Beryllium.getMolten(48), - WerkstoffLoader.Californium.getMolten(48), - 240, - 49152, - 480000000); + Materials.Plutonium.getMolten(48), + Materials.Beryllium.getMolten(48), + WerkstoffLoader.Californium.getMolten(48), + 240, + 49152, + 480000000); GT_Values.RA.addFusionReactorRecipe( - WerkstoffLoader.Californium.getMolten(32), - WerkstoffLoader.Calcium.getMolten(720), - WerkstoffLoader.Oganesson.getFluidOrGas(720), - 420, - 49152, - 600000000); + WerkstoffLoader.Californium.getMolten(32), + WerkstoffLoader.Calcium.getMolten(720), + WerkstoffLoader.Oganesson.getFluidOrGas(720), + 420, + 49152, + 600000000); GT_Values.RA.addDistillationTowerRecipe( - Materials.LiquidAir.getFluid(100000000), - new FluidStack[] { Materials.Nitrogen.getGas(78084000), Materials.Oxygen.getGas(20946000), - Materials.Argon.getGas(934000), Materials.CarbonDioxide.getGas(40700), - WerkstoffLoader.Neon.getFluidOrGas(1818), Materials.Helium.getGas(524), - Materials.Methane.getGas(180), WerkstoffLoader.Krypton.getFluidOrGas(114), - Materials.Hydrogen.getGas(55), WerkstoffLoader.Xenon.getFluidOrGas(9) }, - null, - 7500, - (int) TierEU.RECIPE_EV); - - GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.MagnetoResonaticDust.get(dust)) - .itemOutputs(WerkstoffLoader.MagnetoResonaticDust.get(gemChipped, 9)).outputChances(90_00) - .fluidInputs(WerkstoffLoader.Neon.getFluidOrGas(1000)).duration(3 * MINUTES + 45 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(autoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.MagnetoResonaticDust.get(dust)) - .itemOutputs(WerkstoffLoader.MagnetoResonaticDust.get(gem)) - .fluidInputs(WerkstoffLoader.Krypton.getFluidOrGas(1000)).duration(3 * MINUTES + 45 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(autoclaveRecipes); + Materials.LiquidAir.getFluid(100000000), + new FluidStack[] { Materials.Nitrogen.getGas(78084000), Materials.Oxygen.getGas(20946000), + Materials.Argon.getGas(934000), Materials.CarbonDioxide.getGas(40700), + WerkstoffLoader.Neon.getFluidOrGas(1818), Materials.Helium.getGas(524), Materials.Methane.getGas(180), + WerkstoffLoader.Krypton.getFluidOrGas(114), Materials.Hydrogen.getGas(55), + WerkstoffLoader.Xenon.getFluidOrGas(9) }, + null, + 7500, + (int) TierEU.RECIPE_EV); + + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffLoader.MagnetoResonaticDust.get(dust)) + .itemOutputs(WerkstoffLoader.MagnetoResonaticDust.get(gemChipped, 9)) + .outputChances(90_00) + .fluidInputs(WerkstoffLoader.Neon.getFluidOrGas(1000)) + .duration(3 * MINUTES + 45 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(autoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffLoader.MagnetoResonaticDust.get(dust)) + .itemOutputs(WerkstoffLoader.MagnetoResonaticDust.get(gem)) + .fluidInputs(WerkstoffLoader.Krypton.getFluidOrGas(1000)) + .duration(3 * MINUTES + 45 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(autoclaveRecipes); // Milk - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - Materials.Sugar.getDustSmall(21), - Materials.Calcium.getDustTiny(1), - Materials.Magnesium.getDustTiny(1), - Materials.Potassium.getDustTiny(1), - Materials.Sodium.getDustTiny(4), - Materials.Phosphor.getDustTiny(1)) - .outputChances(100_00, 100_00, 10_00, 100_00, 10_00, 10_00).fluidInputs(Materials.Milk.getFluid(10000)) - .fluidOutputs(Materials.Water.getFluid(8832)).duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(centrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + Materials.Sugar.getDustSmall(21), + Materials.Calcium.getDustTiny(1), + Materials.Magnesium.getDustTiny(1), + Materials.Potassium.getDustTiny(1), + Materials.Sodium.getDustTiny(4), + Materials.Phosphor.getDustTiny(1)) + .outputChances(100_00, 100_00, 10_00, 100_00, 10_00, 10_00) + .fluidInputs(Materials.Milk.getFluid(10000)) + .fluidOutputs(Materials.Water.getFluid(8832)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(centrifugeRecipes); // Magneto Resonatic Circuits Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null - ? FluidRegistry.getFluid("molten.indalloy140") - : FluidRegistry.getFluid("molten.solderingalloy"); + ? FluidRegistry.getFluid("molten.indalloy140") + : FluidRegistry.getFluid("molten.solderingalloy"); Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null - ? FluidRegistry.getFluid("molten.mutatedlivingsolder") - : FluidRegistry.getFluid("molten.solderingalloy"); + ? FluidRegistry.getFluid("molten.mutatedlivingsolder") + : FluidRegistry.getFluid("molten.solderingalloy"); // ULV RecipeMaps.circuitAssemblerRecipes.add( - new GT_Recipe( - false, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gem), ItemList.NandChip.get(1), - ItemList.Circuit_Parts_DiodeSMD.get(4), ItemList.Circuit_Parts_CapacitorSMD.get(4), - ItemList.Circuit_Parts_TransistorSMD.get(4) }, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(4) }, - null, - null, - new FluidStack[] { Materials.SolderingAlloy.getMolten(36) }, - null, - 750, - (int) TierEU.RECIPE_LV, - CLEANROOM)); + new GT_Recipe( + false, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(3), WerkstoffLoader.MagnetoResonaticDust.get(gem), ItemList.NandChip.get(1), + ItemList.Circuit_Parts_DiodeSMD.get(4), ItemList.Circuit_Parts_CapacitorSMD.get(4), + ItemList.Circuit_Parts_TransistorSMD.get(4) }, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(4) }, + null, + null, + new FluidStack[] { Materials.SolderingAlloy.getMolten(36) }, + null, + 750, + (int) TierEU.RECIPE_LV, + CLEANROOM)); // LV-EV for (int i = 1; i <= 4; i++) { RecipeMaps.circuitAssemblerRecipes.add( - new GT_Recipe( - false, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gem), - BW_Meta_Items.getNEWCIRCUITS().getStack(i + 3), - ItemList.Circuit_Parts_DiodeSMD.get((i + 1) * 4), - ItemList.Circuit_Parts_CapacitorSMD.get((i + 1) * 4), - ItemList.Circuit_Parts_TransistorSMD.get((i + 1) * 4) }, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(i + 4) }, - null, - null, - new FluidStack[] { Materials.SolderingAlloy.getMolten((i + 1) * 36) }, - null, - (i + 1) * 750, - BW_Util.getMachineVoltageFromTier(i + 1), - CLEANROOM)); + new GT_Recipe( + false, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(3), WerkstoffLoader.MagnetoResonaticDust.get(gem), + BW_Meta_Items.getNEWCIRCUITS() + .getStack(i + 3), + ItemList.Circuit_Parts_DiodeSMD.get((i + 1) * 4), + ItemList.Circuit_Parts_CapacitorSMD.get((i + 1) * 4), + ItemList.Circuit_Parts_TransistorSMD.get((i + 1) * 4) }, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(i + 4) }, + null, + null, + new FluidStack[] { Materials.SolderingAlloy.getMolten((i + 1) * 36) }, + null, + (i + 1) * 750, + BW_Util.getMachineVoltageFromTier(i + 1), + CLEANROOM)); } // IV-LuV for (int i = 5; i <= 6; i++) { RecipeMaps.circuitAssemblerRecipes.add( - new GT_Recipe( - false, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gem), - BW_Meta_Items.getNEWCIRCUITS().getStack(i + 3), - ItemList.Circuit_Parts_DiodeASMD.get((i + 1) * 4), - ItemList.Circuit_Parts_CapacitorASMD.get((i + 1) * 4), - ItemList.Circuit_Parts_TransistorASMD.get((i + 1) * 4) }, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(i + 4) }, - null, - null, - new FluidStack[] { new FluidStack(solderIndalloy, (i + 1) * 36) }, - null, - (i + 1) * 750, - BW_Util.getMachineVoltageFromTier(i + 1), - CLEANROOM)); + new GT_Recipe( + false, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(3), WerkstoffLoader.MagnetoResonaticDust.get(gem), + BW_Meta_Items.getNEWCIRCUITS() + .getStack(i + 3), + ItemList.Circuit_Parts_DiodeASMD.get((i + 1) * 4), + ItemList.Circuit_Parts_CapacitorASMD.get((i + 1) * 4), + ItemList.Circuit_Parts_TransistorASMD.get((i + 1) * 4) }, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(i + 4) }, + null, + null, + new FluidStack[] { new FluidStack(solderIndalloy, (i + 1) * 36) }, + null, + (i + 1) * 750, + BW_Util.getMachineVoltageFromTier(i + 1), + CLEANROOM)); } // ZPM RecipeMaps.circuitAssemblerRecipes.add( - new GT_Recipe( - false, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, 1), - BW_Meta_Items.getNEWCIRCUITS().getStack(7 + 3), - ItemList.Circuit_Parts_DiodeASMD.get((7 + 6) * 4), - ItemList.Circuit_Parts_CapacitorASMD.get((7 + 6) * 4), - ItemList.Circuit_Parts_TransistorASMD.get((7 + 6) * 4) }, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(7 + 4) }, - null, - null, - new FluidStack[] { new FluidStack(solderIndalloy, (7 + 1) * 36) }, - null, - (7 + 1) * 1500, - BW_Util.getMachineVoltageFromTier(7 + 1), - CLEANROOM)); + new GT_Recipe( + false, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(3), WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, 1), + BW_Meta_Items.getNEWCIRCUITS() + .getStack(7 + 3), + ItemList.Circuit_Parts_DiodeASMD.get((7 + 6) * 4), + ItemList.Circuit_Parts_CapacitorASMD.get((7 + 6) * 4), + ItemList.Circuit_Parts_TransistorASMD.get((7 + 6) * 4) }, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(7 + 4) }, + null, + null, + new FluidStack[] { new FluidStack(solderIndalloy, (7 + 1) * 36) }, + null, + (7 + 1) * 1500, + BW_Util.getMachineVoltageFromTier(7 + 1), + CLEANROOM)); // UV RecipeMaps.circuitAssemblerRecipes.add( - new GT_Recipe( - false, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, 1), - BW_Meta_Items.getNEWCIRCUITS().getStack(8 + 3), - ItemList.Circuit_Parts_DiodeASMD.get((8 + 6) * 4), - ItemList.Circuit_Parts_CapacitorASMD.get((8 + 6) * 4), - ItemList.Circuit_Parts_TransistorASMD.get((8 + 6) * 4) }, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(8 + 4) }, - null, - null, - new FluidStack[] { new FluidStack(solderUEV, (8 + 1) * 36) }, - null, - (8 + 1) * 1500, - BW_Util.getMachineVoltageFromTier(8 + 1), - CLEANROOM)); + new GT_Recipe( + false, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(3), WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, 1), + BW_Meta_Items.getNEWCIRCUITS() + .getStack(8 + 3), + ItemList.Circuit_Parts_DiodeASMD.get((8 + 6) * 4), + ItemList.Circuit_Parts_CapacitorASMD.get((8 + 6) * 4), + ItemList.Circuit_Parts_TransistorASMD.get((8 + 6) * 4) }, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(8 + 4) }, + null, + null, + new FluidStack[] { new FluidStack(solderUEV, (8 + 1) * 36) }, + null, + (8 + 1) * 1500, + BW_Util.getMachineVoltageFromTier(8 + 1), + CLEANROOM)); // UHV-UEV for (int i = 9; i <= 10; i++) { RecipeMaps.circuitAssemblerRecipes.add( - new GT_Recipe( - false, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(3), - WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, 1), - BW_Meta_Items.getNEWCIRCUITS().getStack(i + 3), - ItemList.Circuit_Parts_DiodeXSMD.get((i + 6) * 4), - ItemList.Circuit_Parts_CapacitorXSMD.get((i + 6) * 4), - ItemList.Circuit_Parts_TransistorXSMD.get((i + 6) * 4) }, - new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS().getStack(i + 4) }, - null, - null, - new FluidStack[] { new FluidStack(solderUEV, (i + 1) * 36) }, - null, - (i + 1) * 1500, - BW_Util.getMachineVoltageFromTier(i + 1), - CLEANROOM)); + new GT_Recipe( + false, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(3), WerkstoffLoader.MagnetoResonaticDust.get(gemExquisite, 1), + BW_Meta_Items.getNEWCIRCUITS() + .getStack(i + 3), + ItemList.Circuit_Parts_DiodeXSMD.get((i + 6) * 4), + ItemList.Circuit_Parts_CapacitorXSMD.get((i + 6) * 4), + ItemList.Circuit_Parts_TransistorXSMD.get((i + 6) * 4) }, + new ItemStack[] { BW_Meta_Items.getNEWCIRCUITS() + .getStack(i + 4) }, + null, + null, + new FluidStack[] { new FluidStack(solderUEV, (i + 1) * 36) }, + null, + (i + 1) * 1500, + BW_Util.getMachineVoltageFromTier(i + 1), + CLEANROOM)); } RecipeMaps.smallNaquadahReactorFuels.addRecipe( - true, - new ItemStack[] { WerkstoffLoader.Tiberium.get(bolt) }, - new ItemStack[] {}, - null, - null, - null, - 0, - 0, - 12500); + true, + new ItemStack[] { WerkstoffLoader.Tiberium.get(bolt) }, + new ItemStack[] {}, + null, + null, + null, + 0, + 0, + 12500); RecipeMaps.largeNaquadahReactorFuels.addRecipe( - true, - new ItemStack[] { WerkstoffLoader.Tiberium.get(stick) }, - new ItemStack[] {}, - null, - null, - null, - 0, - 0, - 62500); + true, + new ItemStack[] { WerkstoffLoader.Tiberium.get(stick) }, + new ItemStack[] {}, + null, + null, + null, + 0, + 0, + 62500); RecipeMaps.hugeNaquadahReactorFuels.addRecipe( - true, - new ItemStack[] { WerkstoffLoader.Tiberium.get(stickLong) }, - new ItemStack[] {}, - null, - null, - null, - 0, - 0, - 125000); + true, + new ItemStack[] { WerkstoffLoader.Tiberium.get(stickLong) }, + new ItemStack[] {}, + null, + null, + null, + 0, + 0, + 125000); RecipeMaps.extremeNaquadahReactorFuels.addRecipe( - true, - new ItemStack[] { WerkstoffLoader.Tiberium.get(stick) }, - new ItemStack[] {}, - null, - null, - null, - 0, - 0, - 31250); + true, + new ItemStack[] { WerkstoffLoader.Tiberium.get(stick) }, + new ItemStack[] {}, + null, + null, + null, + 0, + 0, + 31250); RecipeMaps.ultraHugeNaquadahReactorFuels.addRecipe( - true, - new ItemStack[] { WerkstoffLoader.Tiberium.get(stickLong) }, - new ItemStack[] {}, - null, - null, - null, - 0, - 0, - 125000); + true, + new ItemStack[] { WerkstoffLoader.Tiberium.get(stickLong) }, + new ItemStack[] {}, + null, + null, + null, + 0, + 0, + 125000); LoadItemContainers.run(); GT_Values.RA.addCannerRecipe( - ItemList.Large_Fluid_Cell_TungstenSteel.get(1L), - WerkstoffLoader.Tiberium.get(dust, 3), - BW_NonMeta_MaterialItems.TiberiumCell_1.get(1L), - null, - 30, - 16); + ItemList.Large_Fluid_Cell_TungstenSteel.get(1L), + WerkstoffLoader.Tiberium.get(dust, 3), + BW_NonMeta_MaterialItems.TiberiumCell_1.get(1L), + null, + 30, + 16); GT_Values.RA.addAssemblerRecipe( - BW_NonMeta_MaterialItems.TiberiumCell_1.get(2L), - GT_OreDictUnificator.get(stick, Materials.TungstenSteel, 4L), - BW_NonMeta_MaterialItems.TiberiumCell_2.get(1L), - 100, - 400); + BW_NonMeta_MaterialItems.TiberiumCell_1.get(2L), + GT_OreDictUnificator.get(stick, Materials.TungstenSteel, 4L), + BW_NonMeta_MaterialItems.TiberiumCell_2.get(1L), + 100, + 400); GT_Values.RA.addAssemblerRecipe( - BW_NonMeta_MaterialItems.TiberiumCell_1.get(4L), - GT_OreDictUnificator.get(stickLong, Materials.TungstenSteel, 6L), - BW_NonMeta_MaterialItems.TiberiumCell_4.get(1L), - 150, - 400); + BW_NonMeta_MaterialItems.TiberiumCell_1.get(4L), + GT_OreDictUnificator.get(stickLong, Materials.TungstenSteel, 6L), + BW_NonMeta_MaterialItems.TiberiumCell_4.get(1L), + 150, + 400); GT_Values.RA.addAssemblerRecipe( - BW_NonMeta_MaterialItems.TiberiumCell_2.get(2L), - GT_OreDictUnificator.get(stick, Materials.TungstenSteel, 4L), - BW_NonMeta_MaterialItems.TiberiumCell_4.get(1L), - 100, - 400); + BW_NonMeta_MaterialItems.TiberiumCell_2.get(2L), + GT_OreDictUnificator.get(stick, Materials.TungstenSteel, 4L), + BW_NonMeta_MaterialItems.TiberiumCell_4.get(1L), + 100, + 400); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.NaquadahCell_1.get(32L), - GT_OreDictUnificator.get(stickLong, Materials.TungstenSteel, 64L), - GT_OreDictUnificator.get(stickLong, Materials.TungstenSteel, 64L), - GT_OreDictUnificator.get(stickLong, Materials.TungstenSteel, 64L), - WerkstoffLoader.Tiberium.get(dust, 64), WerkstoffLoader.Tiberium.get(dust, 64) }, - null, - BW_NonMeta_MaterialItems.TheCoreCell.get(1L), - 100, - (int) TierEU.RECIPE_LuV); + new ItemStack[] { ItemList.NaquadahCell_1.get(32L), + GT_OreDictUnificator.get(stickLong, Materials.TungstenSteel, 64L), + GT_OreDictUnificator.get(stickLong, Materials.TungstenSteel, 64L), + GT_OreDictUnificator.get(stickLong, Materials.TungstenSteel, 64L), + WerkstoffLoader.Tiberium.get(dust, 64), WerkstoffLoader.Tiberium.get(dust, 64) }, + null, + BW_NonMeta_MaterialItems.TheCoreCell.get(1L), + 100, + (int) TierEU.RECIPE_LuV); GregTech_API.sAfterGTPostload.add(new AddSomeRecipes()); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/DownTierLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/DownTierLoader.java index 2aa7394435..f07faa79a8 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/DownTierLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/DownTierLoader.java @@ -27,17 +27,22 @@ import gregtech.api.util.GT_Recipe; public class DownTierLoader { public static void run() { - RecipeMap.ALL_RECIPE_MAPS.values().stream() - .filter(map -> StreamUtils.filterVisualMaps(map) && map != RecipeMaps.fusionRecipes).forEach(map -> { - Set<GT_Recipe> newRecipes = new HashSet<>(); - Set<GT_Recipe> toRem = new HashSet<>(); - map.getAllRecipes().stream().filter(recipe -> Objects.nonNull(recipe) && recipe.mEUt > 128) - .forEach(recipe -> { - toRem.add(recipe); - newRecipes.add(BW_Util.copyAndSetTierToNewRecipe(recipe, (byte) 2)); - }); - map.getBackend().removeRecipes(toRem); - newRecipes.forEach(map::add); - }); + RecipeMap.ALL_RECIPE_MAPS.values() + .stream() + .filter(map -> StreamUtils.filterVisualMaps(map) && map != RecipeMaps.fusionRecipes) + .forEach(map -> { + Set<GT_Recipe> newRecipes = new HashSet<>(); + Set<GT_Recipe> toRem = new HashSet<>(); + map.getAllRecipes() + .stream() + .filter(recipe -> Objects.nonNull(recipe) && recipe.mEUt > 128) + .forEach(recipe -> { + toRem.add(recipe); + newRecipes.add(BW_Util.copyAndSetTierToNewRecipe(recipe, (byte) 2)); + }); + map.getBackend() + .removeRecipes(toRem); + newRecipes.forEach(map::add); + }); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/LoadItemContainers.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/LoadItemContainers.java index 2b26680738..67de5d5f5b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/LoadItemContainers.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/LoadItemContainers.java @@ -22,56 +22,56 @@ public class LoadItemContainers { public static void run() { BW_NonMeta_MaterialItems.Depleted_Tiberium_1 - .set(new GT_DepletetCell_Item("TiberiumcellDep", "Fuel Rod (Depleted Tiberium)", 1)); + .set(new GT_DepletetCell_Item("TiberiumcellDep", "Fuel Rod (Depleted Tiberium)", 1)); BW_NonMeta_MaterialItems.Depleted_Tiberium_2 - .set(new GT_DepletetCell_Item("Double_TiberiumcellDep", "Dual Fuel Rod (Depleted Tiberium)", 1)); + .set(new GT_DepletetCell_Item("Double_TiberiumcellDep", "Dual Fuel Rod (Depleted Tiberium)", 1)); BW_NonMeta_MaterialItems.Depleted_Tiberium_4 - .set(new GT_DepletetCell_Item("Quad_TiberiumcellDep", "Quad Fuel Rod (Depleted Tiberium)", 1)); + .set(new GT_DepletetCell_Item("Quad_TiberiumcellDep", "Quad Fuel Rod (Depleted Tiberium)", 1)); BW_NonMeta_MaterialItems.TiberiumCell_1.set( - new GT_RadioactiveCellIC_Item( - "Tiberiumcell", - "Fuel Rod (Tiberium)", - 1, - 50000, - 2F, - 1, - 0.5F, - BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1), - false)); + new GT_RadioactiveCellIC_Item( + "Tiberiumcell", + "Fuel Rod (Tiberium)", + 1, + 50000, + 2F, + 1, + 0.5F, + BW_NonMeta_MaterialItems.Depleted_Tiberium_1.get(1), + false)); BW_NonMeta_MaterialItems.TiberiumCell_2.set( - new GT_RadioactiveCellIC_Item( - "Double_Tiberiumcell", - "Dual Fuel Rod (Tiberium)", - 2, - 50000, - 2F, - 1, - 0.5F, - BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1), - false)); + new GT_RadioactiveCellIC_Item( + "Double_Tiberiumcell", + "Dual Fuel Rod (Tiberium)", + 2, + 50000, + 2F, + 1, + 0.5F, + BW_NonMeta_MaterialItems.Depleted_Tiberium_2.get(1), + false)); BW_NonMeta_MaterialItems.TiberiumCell_4.set( - new GT_RadioactiveCellIC_Item( - "Quad_Tiberiumcell", - "Quad Fuel Rod (Tiberium)", - 4, - 50000, - 2F, - 1, - 0.5F, - BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1), - false)); + new GT_RadioactiveCellIC_Item( + "Quad_Tiberiumcell", + "Quad Fuel Rod (Tiberium)", + 4, + 50000, + 2F, + 1, + 0.5F, + BW_NonMeta_MaterialItems.Depleted_Tiberium_4.get(1), + false)); BW_NonMeta_MaterialItems.Depleted_TheCoreCell - .set(new GT_DepletetCell_Item("Core_Reactor_CellDep", "Depleted \"The Core\" Cell", 32)); + .set(new GT_DepletetCell_Item("Core_Reactor_CellDep", "Depleted \"The Core\" Cell", 32)); BW_NonMeta_MaterialItems.TheCoreCell.set( - new GT_RadioactiveCellIC_Item( - "Core_Reactor_Cell", - "\"The Core\" Cell", - 32, - 100000, - 8F, - 32, - 1F, - BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1), - false)); + new GT_RadioactiveCellIC_Item( + "Core_Reactor_Cell", + "\"The Core\" Cell", + 32, + 100000, + 8F, + 32, + 1F, + BW_NonMeta_MaterialItems.Depleted_TheCoreCell.get(1), + false)); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/AspectLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/AspectLoader.java index 03b9315c11..a61bc55d59 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/AspectLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/AspectLoader.java @@ -39,20 +39,19 @@ public class AspectLoader implements IWerkstoffRunnable { if (werkstoff.hasItemType(enabledOrePrefixes)) { if (enabledOrePrefixes.mMaterialAmount >= 3628800L || enabledOrePrefixes == OrePrefixes.ore) { DebugLog.log( - "OrePrefix: " + enabledOrePrefixes.name() - + " mMaterialAmount: " - + enabledOrePrefixes.mMaterialAmount / 3628800L); + "OrePrefix: " + enabledOrePrefixes.name() + + " mMaterialAmount: " + + enabledOrePrefixes.mMaterialAmount / 3628800L); if (Objects.nonNull(WerkstoffLoader.items.get(enabledOrePrefixes))) ThaumcraftHandler.AspectAdder.addAspectViaBW( - werkstoff.get(enabledOrePrefixes), - werkstoff.getTCAspects( - enabledOrePrefixes == OrePrefixes.ore ? 1 - : (int) (enabledOrePrefixes.mMaterialAmount / 3628800L))); - } else if (enabledOrePrefixes.mMaterialAmount >= 0L - && Objects.nonNull(WerkstoffLoader.items.get(enabledOrePrefixes))) - ThaumcraftHandler.AspectAdder.addAspectViaBW( werkstoff.get(enabledOrePrefixes), - new Pair<>(TC_Aspects.PERDITIO.mAspect, 1)); + werkstoff.getTCAspects( + enabledOrePrefixes == OrePrefixes.ore ? 1 + : (int) (enabledOrePrefixes.mMaterialAmount / 3628800L))); + } else if (enabledOrePrefixes.mMaterialAmount >= 0L + && Objects.nonNull(WerkstoffLoader.items.get(enabledOrePrefixes))) + ThaumcraftHandler.AspectAdder + .addAspectViaBW(werkstoff.get(enabledOrePrefixes), new Pair<>(TC_Aspects.PERDITIO.mAspect, 1)); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java index b0402b1d1d..1262ab2499 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/BlockLoader.java @@ -37,21 +37,37 @@ public class BlockLoader implements IWerkstoffRunnable { public void run(Werkstoff werkstoff) { if (!werkstoff.hasItemType(block)) return; if (werkstoff.hasItemType(ingot)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(block)).itemOutputs(werkstoff.get(ingot, 9)) - .duration(16 * TICKS).eut(90).metadata(GT_RecipeConstants.RECYCLE, true).addTo(UniversalArcFurnace); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(block)) + .itemOutputs(werkstoff.get(ingot, 9)) + .duration(16 * TICKS) + .eut(90) + .metadata(GT_RecipeConstants.RECYCLE, true) + .addTo(UniversalArcFurnace); } if (werkstoff.hasItemType(cellMolten)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(block)).fluidOutputs(werkstoff.getMolten(1296)) - .recipeCategory(RecipeCategories.fluidExtractorRecycling).duration(14 * SECONDS + 8 * TICKS).eut(8) - .addTo(fluidExtractionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(block)) + .fluidOutputs(werkstoff.getMolten(1296)) + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .duration(14 * SECONDS + 8 * TICKS) + .eut(8) + .addTo(fluidExtractionRecipes); } if (werkstoff.hasItemType(plate)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(block)).itemOutputs(werkstoff.get(plate, 9)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 10L, 1L)).eut(TierEU.RECIPE_LV) - .addTo(cutterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(block)) + .itemOutputs(werkstoff.get(plate, 9)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 10L, + 1L)) + .eut(TierEU.RECIPE_LV) + .addTo(cutterRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CasingLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CasingLoader.java index 967a25665e..9ec4030943 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CasingLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CasingLoader.java @@ -41,11 +41,10 @@ public class CasingLoader implements IWerkstoffRunnable { addCasingRecipes(werkstoff, plank); } else { if (!werkstoff.hasGenerationFeature(blockCasing) || !werkstoff.doesOreDictedItemExists(plate) - || !werkstoff.doesOreDictedItemExists(screw) - || !werkstoff.doesOreDictedItemExists(gearGtSmall) - || !werkstoff.doesOreDictedItemExists(gearGt) - || !werkstoff.doesOreDictedItemExists(plateDouble)) - return; + || !werkstoff.doesOreDictedItemExists(screw) + || !werkstoff.doesOreDictedItemExists(gearGtSmall) + || !werkstoff.doesOreDictedItemExists(gearGt) + || !werkstoff.doesOreDictedItemExists(plateDouble)) return; addCasingRecipes(werkstoff, plateDouble); } @@ -53,23 +52,27 @@ public class CasingLoader implements IWerkstoffRunnable { private static void addCasingRecipes(Werkstoff werkstoff, OrePrefixes reboltedCasingsOuterStuff) { GT_ModHandler.addCraftingRecipe( - werkstoff.get(blockCasing), - new Object[] { "PSP", "PGP", "PSP", 'P', werkstoff.get(plate), 'S', werkstoff.get(screw), 'G', - werkstoff.get(gearGtSmall) }); + werkstoff.get(blockCasing), + new Object[] { "PSP", "PGP", "PSP", 'P', werkstoff.get(plate), 'S', werkstoff.get(screw), 'G', + werkstoff.get(gearGtSmall) }); GT_Values.RA.stdBuilder() - .itemInputs(werkstoff.get(plate, 6), werkstoff.get(screw, 2), werkstoff.get(gearGtSmall)) - .itemOutputs(werkstoff.get(blockCasing)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); + .itemInputs(werkstoff.get(plate, 6), werkstoff.get(screw, 2), werkstoff.get(gearGtSmall)) + .itemOutputs(werkstoff.get(blockCasing)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); GT_ModHandler.addCraftingRecipe( - werkstoff.get(blockCasingAdvanced), - new Object[] { "PSP", "PGP", "PSP", 'P', werkstoff.get(reboltedCasingsOuterStuff), 'S', - werkstoff.get(screw), 'G', werkstoff.get(gearGt) }); + werkstoff.get(blockCasingAdvanced), + new Object[] { "PSP", "PGP", "PSP", 'P', werkstoff.get(reboltedCasingsOuterStuff), 'S', + werkstoff.get(screw), 'G', werkstoff.get(gearGt) }); GT_Values.RA.stdBuilder() - .itemInputs(werkstoff.get(reboltedCasingsOuterStuff, 6), werkstoff.get(screw, 2), werkstoff.get(gearGt)) - .itemOutputs(werkstoff.get(blockCasingAdvanced)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); + .itemInputs(werkstoff.get(reboltedCasingsOuterStuff, 6), werkstoff.get(screw, 2), werkstoff.get(gearGt)) + .itemOutputs(werkstoff.get(blockCasingAdvanced)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java index 379424d9d4..2b86f46149 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java @@ -57,18 +57,23 @@ public class CellLoader implements IWerkstoffRunnable { public void run(Werkstoff werkstoff) { if (!werkstoff.hasItemType(cell)) return; - if ((werkstoff.getStats().isElektrolysis() || werkstoff.getStats().isCentrifuge()) - && !werkstoff.hasItemType(dust)) { + if ((werkstoff.getStats() + .isElektrolysis() + || werkstoff.getStats() + .isCentrifuge()) + && !werkstoff.hasItemType(dust)) { List<FluidStack> flOutputs = new ArrayList<>(); List<ItemStack> stOutputs = new ArrayList<>(); HashMap<ISubTagContainer, Pair<Integer, Integer>> tracker = new HashMap<>(); int cells = 0; - for (Pair<ISubTagContainer, Integer> container : werkstoff.getContents().getValue().toArray(new Pair[0])) { + for (Pair<ISubTagContainer, Integer> container : werkstoff.getContents() + .getValue() + .toArray(new Pair[0])) { if (container.getKey() instanceof Materials) { if ((((Materials) container.getKey()).hasCorrespondingGas() - || ((Materials) container.getKey()).hasCorrespondingFluid() - || ((Materials) container.getKey()).mIconSet == TextureSet.SET_FLUID) - && ((Materials) container.getKey()).getDust(0) == null) { + || ((Materials) container.getKey()).hasCorrespondingFluid() + || ((Materials) container.getKey()).mIconSet == TextureSet.SET_FLUID) + && ((Materials) container.getKey()).getDust(0) == null) { FluidStack tmpFl = ((Materials) container.getKey()).getGas(1000L * container.getValue()); if (tmpFl == null || tmpFl.getFluid() == null) { tmpFl = ((Materials) container.getKey()).getFluid(1000L * container.getValue()); @@ -80,9 +85,12 @@ public class CellLoader implements IWerkstoffRunnable { tracker.put(container.getKey(), new Pair<>(container.getValue(), stOutputs.size() - 1)); } else { stOutputs.add( - ((Materials) container.getKey()).getCells( - tracker.get(container.getKey()).getKey() + container.getValue())); - stOutputs.remove(tracker.get(container.getKey()).getValue() + 1); + ((Materials) container.getKey()).getCells( + tracker.get(container.getKey()) + .getKey() + container.getValue())); + stOutputs.remove( + tracker.get(container.getKey()) + .getValue() + 1); } cells += container.getValue(); } @@ -93,14 +101,17 @@ public class CellLoader implements IWerkstoffRunnable { tracker.put(container.getKey(), new Pair<>(container.getValue(), stOutputs.size() - 1)); } else { stOutputs.add( - ((Materials) container.getKey()) - .getDust(tracker.get(container.getKey()).getKey() + container.getValue())); - stOutputs.remove(tracker.get(container.getKey()).getValue() + 1); + ((Materials) container.getKey()).getDust( + tracker.get(container.getKey()) + .getKey() + container.getValue())); + stOutputs.remove( + tracker.get(container.getKey()) + .getValue() + 1); } } } else if (container.getKey() instanceof Werkstoff) { - if (((Werkstoff) container.getKey()).getStats().isGas() - || ((Werkstoff) container.getKey()).hasItemType(cell)) { + if (((Werkstoff) container.getKey()).getStats() + .isGas() || ((Werkstoff) container.getKey()).hasItemType(cell)) { FluidStack tmpFl = ((Werkstoff) container.getKey()).getFluidOrGas(1000 * container.getValue()); if (tmpFl == null || tmpFl.getFluid() == null) { tmpFl = ((Werkstoff) container.getKey()).getFluidOrGas(1000 * container.getValue()); @@ -112,10 +123,13 @@ public class CellLoader implements IWerkstoffRunnable { tracker.put(container.getKey(), new Pair<>(container.getValue(), stOutputs.size() - 1)); } else { stOutputs.add( - ((Werkstoff) container.getKey()).get( - cell, - tracker.get(container.getKey()).getKey() + container.getValue())); - stOutputs.remove(tracker.get(container.getKey()).getValue() + 1); + ((Werkstoff) container.getKey()).get( + cell, + tracker.get(container.getKey()) + .getKey() + container.getValue())); + stOutputs.remove( + tracker.get(container.getKey()) + .getValue() + 1); } cells += container.getValue(); } @@ -126,10 +140,13 @@ public class CellLoader implements IWerkstoffRunnable { tracker.put(container.getKey(), new Pair<>(container.getValue(), stOutputs.size() - 1)); } else { stOutputs.add( - ((Werkstoff) container.getKey()).get( - dust, - tracker.get(container.getKey()).getKey() + container.getValue())); - stOutputs.remove(tracker.get(container.getKey()).getValue() + 1); + ((Werkstoff) container.getKey()).get( + dust, + tracker.get(container.getKey()) + .getKey() + container.getValue())); + stOutputs.remove( + tracker.get(container.getKey()) + .getValue() + 1); } } } @@ -140,82 +157,130 @@ public class CellLoader implements IWerkstoffRunnable { int cellEmpty = cells - 1; stOutputs.add(Materials.Empty.getCells(-cellEmpty)); - if (werkstoff.getStats().isElektrolysis()) RecipeMaps.electrolyzerRecipes.add( + if (werkstoff.getStats() + .isElektrolysis()) + RecipeMaps.electrolyzerRecipes.add( new GT_Recipe( - true, - new ItemStack[] { input, cellEmpty > 0 ? Materials.Empty.getCells(cellEmpty) : null }, - stOutputs.toArray(new ItemStack[0]), - null, - null, - new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, - (int) Math.max( - 1L, - Math.abs( - werkstoff.getStats().getProtons() - * werkstoff.getContents().getValue().size())), - Math.min(4, werkstoff.getContents().getValue().size()) * 30, - 0)); - if (werkstoff.getStats().isCentrifuge()) RecipeMaps.centrifugeRecipes.add( + true, + new ItemStack[] { input, cellEmpty > 0 ? Materials.Empty.getCells(cellEmpty) : null }, + stOutputs.toArray(new ItemStack[0]), + null, + null, + new FluidStack[] { null }, + new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + (int) Math.max( + 1L, + Math.abs( + werkstoff.getStats() + .getProtons() + * werkstoff.getContents() + .getValue() + .size())), + Math.min( + 4, + werkstoff.getContents() + .getValue() + .size()) + * 30, + 0)); + if (werkstoff.getStats() + .isCentrifuge()) + RecipeMaps.centrifugeRecipes.add( new GT_Recipe( - true, - new ItemStack[] { input, cellEmpty > 0 ? Materials.Empty.getCells(cellEmpty) : null }, - stOutputs.toArray(new ItemStack[0]), - null, - null, - new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, - (int) Math.max( - 1L, - Math.abs( - werkstoff.getStats().getMass() - * werkstoff.getContents().getValue().size())), - Math.min(4, werkstoff.getContents().getValue().size()) * 5, - 0)); + true, + new ItemStack[] { input, cellEmpty > 0 ? Materials.Empty.getCells(cellEmpty) : null }, + stOutputs.toArray(new ItemStack[0]), + null, + null, + new FluidStack[] { null }, + new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + (int) Math.max( + 1L, + Math.abs( + werkstoff.getStats() + .getMass() + * werkstoff.getContents() + .getValue() + .size())), + Math.min( + 4, + werkstoff.getContents() + .getValue() + .size()) + * 5, + 0)); } // Tank "Recipe" GT_Utility.addFluidContainerData( - new FluidContainerRegistry.FluidContainerData( - new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000), - werkstoff.get(cell), - Materials.Empty.getCells(1))); - FluidContainerRegistry.registerFluidContainer( - werkstoff.getFluidOrGas(1).getFluid(), + new FluidContainerRegistry.FluidContainerData( + new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000), werkstoff.get(cell), - Materials.Empty.getCells(1)); + Materials.Empty.getCells(1))); + FluidContainerRegistry.registerFluidContainer( + werkstoff.getFluidOrGas(1) + .getFluid(), + werkstoff.get(cell), + Materials.Empty.getCells(1)); - GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(1)).itemOutputs(werkstoff.get(cell)) - .fluidInputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000)) - .duration(16 * TICKS).eut(2).addTo(fluidCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Empty.getCells(1)) + .itemOutputs(werkstoff.get(cell)) + .fluidInputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000)) + .duration(16 * TICKS) + .eut(2) + .addTo(fluidCannerRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(cell)).itemOutputs(Materials.Empty.getCells(1)) - .fluidOutputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000)) - .duration(16 * TICKS).eut(2).addTo(fluidCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(cell)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidOutputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000)) + .duration(16 * TICKS) + .eut(2) + .addTo(fluidCannerRecipes); if (Forestry.isModLoaded()) { FluidContainerRegistry.FluidContainerData emptyData = new FluidContainerRegistry.FluidContainerData( - new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000), - werkstoff.get(capsule), - GT_ModHandler.getModItem(Forestry.ID, "waxCapsule", 1), - true); + new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000), + werkstoff.get(capsule), + GT_ModHandler.getModItem(Forestry.ID, "waxCapsule", 1), + true); GT_Utility.addFluidContainerData(emptyData); FluidContainerRegistry.registerFluidContainer(emptyData); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(capsule)) - .fluidOutputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000)) - .duration(16 * TICKS).eut(2).addTo(fluidCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(capsule)) + .fluidOutputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.fluids.get(werkstoff)), 1000)) + .duration(16 * TICKS) + .eut(2) + .addTo(fluidCannerRecipes); } if (werkstoff.hasItemType(dust)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dust)).fluidOutputs(werkstoff.getFluidOrGas(1000)) - .duration(werkstoff.getStats().getMass()).eut(werkstoff.getStats().getMass() > 128 ? 64 : 30) - .recipeCategory(RecipeCategories.fluidExtractorRecycling).addTo(fluidExtractionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dust)) + .fluidOutputs(werkstoff.getFluidOrGas(1000)) + .duration( + werkstoff.getStats() + .getMass()) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).itemOutputs(werkstoff.get(dust)) - .fluidInputs(werkstoff.getFluidOrGas(1000)).duration((int) werkstoff.getStats().getMass()) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(werkstoff.get(dust)) + .fluidInputs(werkstoff.getFluidOrGas(1000)) + .duration( + (int) werkstoff.getStats() + .getMass()) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); } @@ -223,17 +288,18 @@ public class CellLoader implements IWerkstoffRunnable { Materials werkstoffBridgeMaterial = null; boolean ElementSet = false; for (Element e : Element.values()) { - if (e.toString().equals(werkstoff.getToolTip())) { + if (e.toString() + .equals(werkstoff.getToolTip())) { werkstoffBridgeMaterial = werkstoff.getBridgeMaterial() != null ? werkstoff.getBridgeMaterial() - : new Materials( - -1, - werkstoff.getTexSet(), - 0, - 0, - 0, - false, - werkstoff.getDefaultName(), - werkstoff.getDefaultName()); + : new Materials( + -1, + werkstoff.getTexSet(), + 0, + 0, + 0, + false, + werkstoff.getDefaultName(), + werkstoff.getDefaultName()); werkstoffBridgeMaterial.mElement = e; e.mLinkedMaterials.add(werkstoffBridgeMaterial); ElementSet = true; @@ -249,18 +315,18 @@ public class CellLoader implements IWerkstoffRunnable { Behaviour_DataOrb.setDataTitle(scannerOutput, "Elemental-Scan"); Behaviour_DataOrb.setDataName(scannerOutput, werkstoff.getToolTip()); RecipeMaps.scannerFakeRecipes.addFakeRecipe( + false, + new GT_Recipe( false, - new GT_Recipe( - false, - new ItemStack[] { werkstoff.get(cell) }, - new ItemStack[] { scannerOutput }, - ItemList.Tool_DataOrb.get(1L), - null, - null, - null, - (int) (werkstoffBridgeMaterial.getMass() * 8192L), - 30, - 0)); + new ItemStack[] { werkstoff.get(cell) }, + new ItemStack[] { scannerOutput }, + ItemList.Tool_DataOrb.get(1L), + null, + null, + null, + (int) (werkstoffBridgeMaterial.getMass() * 8192L), + 30, + 0)); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java index 57986cdfe3..91fe34e89f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java @@ -53,113 +53,196 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable { @Override public void run(Werkstoff werkstoff) { if (werkstoff.hasItemType(screw)) { - int tVoltageMultiplier = werkstoff.getStats().getMeltingPoint() >= 2800 ? 60 : 15; + int tVoltageMultiplier = werkstoff.getStats() + .getMeltingPoint() >= 2800 ? 60 : 15; // bolt GT_Values.RA.stdBuilder() - .itemInputs( - werkstoff.hasItemType(gem) ? werkstoff.get(gem) : werkstoff.get(ingot), - ItemList.Shape_Extruder_Bolt.get(0L)) - .itemOutputs(werkstoff.get(bolt, 8)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 2L, 1)).eut(8 * tVoltageMultiplier) - .addTo(extruderRecipes); + .itemInputs( + werkstoff.hasItemType(gem) ? werkstoff.get(gem) : werkstoff.get(ingot), + ItemList.Shape_Extruder_Bolt.get(0L)) + .itemOutputs(werkstoff.get(bolt, 8)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 2L, + 1)) + .eut(8 * tVoltageMultiplier) + .addTo(extruderRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(stick)).itemOutputs(werkstoff.get(bolt, 4)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 2L, 1L)).eut(4).addTo(cutterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(stick)) + .itemOutputs(werkstoff.get(bolt, 4)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 2L, + 1L)) + .eut(4) + .addTo(cutterRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(bolt)).itemOutputs(werkstoff.get(dustTiny, 1)) - .duration(2 * TICKS).eut(8).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(bolt)) + .itemOutputs(werkstoff.get(dustTiny, 1)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); // screw - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(bolt)).itemOutputs(werkstoff.get(screw)) - .duration((int) Math.max(werkstoff.getStats().getMass() / 8L, 1L)).eut(4).addTo(latheRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(bolt)) + .itemOutputs(werkstoff.get(screw)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() / 8L, + 1L)) + .eut(4) + .addTo(latheRecipes); GT_ModHandler.addCraftingRecipe( - werkstoff.get(screw), - GT_Proxy.tBits, - new Object[] { "fX", "X ", 'X', werkstoff.get(bolt) }); + werkstoff.get(screw), + GT_Proxy.tBits, + new Object[] { "fX", "X ", 'X', werkstoff.get(bolt) }); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(screw)).itemOutputs(werkstoff.get(dustTiny, 1)) - .duration(2 * TICKS).eut(8).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(screw)) + .itemOutputs(werkstoff.get(dustTiny, 1)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); if (werkstoff.hasItemType(gem)) return; // ring - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot), ItemList.Shape_Extruder_Ring.get(0L)) - .itemOutputs(werkstoff.get(ring, 4)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 2L, 1)).eut(6 * tVoltageMultiplier) - .addTo(extruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot), ItemList.Shape_Extruder_Ring.get(0L)) + .itemOutputs(werkstoff.get(ring, 4)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 2L, + 1)) + .eut(6 * tVoltageMultiplier) + .addTo(extruderRecipes); GT_ModHandler.addCraftingRecipe( - werkstoff.get(ring), - GT_Proxy.tBits, - new Object[] { "h ", "fX", 'X', werkstoff.get(stick) }); + werkstoff.get(ring), + GT_Proxy.tBits, + new Object[] { "h ", "fX", 'X', werkstoff.get(stick) }); // Gear GT_ModHandler.addCraftingRecipe( - werkstoff.get(gearGt), - GT_Proxy.tBits, - new Object[] { "SPS", "PwP", "SPS", 'P', werkstoff.get(plate), 'S', werkstoff.get(stick) }); + werkstoff.get(gearGt), + GT_Proxy.tBits, + new Object[] { "SPS", "PwP", "SPS", 'P', werkstoff.get(plate), 'S', werkstoff.get(stick) }); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot, 4), ItemList.Shape_Extruder_Gear.get(0L)) - .itemOutputs(werkstoff.get(gearGt)).duration((int) Math.max(werkstoff.getStats().getMass() * 5L, 1)) - .eut(8 * tVoltageMultiplier).addTo(extruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot, 4), ItemList.Shape_Extruder_Gear.get(0L)) + .itemOutputs(werkstoff.get(gearGt)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 5L, + 1)) + .eut(8 * tVoltageMultiplier) + .addTo(extruderRecipes); // wireFine - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot), ItemList.Shape_Extruder_Wire.get(0L)) - .itemOutputs(werkstoff.get(wireFine, 8)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 1.5F, 1F)).eut(8 * tVoltageMultiplier) - .addTo(extruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot), ItemList.Shape_Extruder_Wire.get(0L)) + .itemOutputs(werkstoff.get(wireFine, 8)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 1.5F, + 1F)) + .eut(8 * tVoltageMultiplier) + .addTo(extruderRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(werkstoff.get(wireFine, 8)).duration((int) Math.max(werkstoff.getStats().getMass(), 1)) - .eut(8 * tVoltageMultiplier).addTo(wiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(werkstoff.get(wireFine, 8)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass(), + 1)) + .eut(8 * tVoltageMultiplier) + .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(stick), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(werkstoff.get(wireFine, 4)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 0.5F, 1F)).eut(8 * tVoltageMultiplier) - .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(stick), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(werkstoff.get(wireFine, 4)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 0.5F, + 1F)) + .eut(8 * tVoltageMultiplier) + .addTo(wiremillRecipes); // smallGear if (WerkstoffLoader.smallGearShape != null) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot), WerkstoffLoader.smallGearShape.get(0L)) - .itemOutputs(werkstoff.get(gearGtSmall)).duration((int) werkstoff.getStats().getMass()) - .eut(8 * tVoltageMultiplier).addTo(extruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot), WerkstoffLoader.smallGearShape.get(0L)) + .itemOutputs(werkstoff.get(gearGtSmall)) + .duration( + (int) werkstoff.getStats() + .getMass()) + .eut(8 * tVoltageMultiplier) + .addTo(extruderRecipes); } GT_ModHandler.addCraftingRecipe( - werkstoff.get(gearGtSmall), - GT_Proxy.tBits, - new Object[] { " S ", "hPx", " S ", 'S', werkstoff.get(stick), 'P', werkstoff.get(plate) }); + werkstoff.get(gearGtSmall), + GT_Proxy.tBits, + new Object[] { " S ", "hPx", " S ", 'S', werkstoff.get(stick), 'P', werkstoff.get(plate) }); // Rotor GT_ModHandler.addCraftingRecipe( - werkstoff.get(rotor), - GT_Proxy.tBits, - new Object[] { "PhP", "SRf", "PdP", 'P', werkstoff.get(plate), 'R', werkstoff.get(ring), 'S', - werkstoff.get(screw) }); + werkstoff.get(rotor), + GT_Proxy.tBits, + new Object[] { "PhP", "SRf", "PdP", 'P', werkstoff.get(plate), 'R', werkstoff.get(ring), 'S', + werkstoff.get(screw) }); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(plate, 4), werkstoff.get(ring)) - .itemOutputs(werkstoff.get(rotor)).fluidInputs(Materials.Tin.getMolten(32)).duration(12 * SECONDS) - .eut(24).addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(plate, 4), werkstoff.get(ring)) + .itemOutputs(werkstoff.get(rotor)) + .fluidInputs(Materials.Tin.getMolten(32)) + .duration(12 * SECONDS) + .eut(24) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(plate, 4), werkstoff.get(ring)) - .itemOutputs(werkstoff.get(rotor)).fluidInputs(Materials.Lead.getMolten(48)).duration(12 * SECONDS) - .eut(24).addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(plate, 4), werkstoff.get(ring)) + .itemOutputs(werkstoff.get(rotor)) + .fluidInputs(Materials.Lead.getMolten(48)) + .duration(12 * SECONDS) + .eut(24) + .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(plate, 4), werkstoff.get(ring)) - .itemOutputs(werkstoff.get(rotor)).fluidInputs(Materials.SolderingAlloy.getMolten(16)) - .duration(12 * SECONDS).eut(24).addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(plate, 4), werkstoff.get(ring)) + .itemOutputs(werkstoff.get(rotor)) + .fluidInputs(Materials.SolderingAlloy.getMolten(16)) + .duration(12 * SECONDS) + .eut(24) + .addTo(assemblerRecipes); if (WerkstoffLoader.rotorShape != null) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot, 5), WerkstoffLoader.rotorShape.get(0L)) - .itemOutputs(werkstoff.get(rotor)).duration(10 * SECONDS).eut(60).addTo(extruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot, 5), WerkstoffLoader.rotorShape.get(0L)) + .itemOutputs(werkstoff.get(rotor)) + .duration(10 * SECONDS) + .eut(60) + .addTo(extruderRecipes); } @@ -180,18 +263,33 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable { */ } - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gearGt)).itemOutputs(werkstoff.get(dust, 4)) - .duration(2 * TICKS).eut(8).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gearGt)) + .itemOutputs(werkstoff.get(dust, 4)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gearGtSmall)).itemOutputs(werkstoff.get(dust, 1)) - .duration(2 * TICKS).eut(8).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gearGtSmall)) + .itemOutputs(werkstoff.get(dust, 1)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(rotor)) - .itemOutputs(werkstoff.get(dust, 4), werkstoff.get(dustSmall)).duration(2 * TICKS).eut(8) - .addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(rotor)) + .itemOutputs(werkstoff.get(dust, 4), werkstoff.get(dustSmall)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ring)).itemOutputs(werkstoff.get(dustSmall, 1)) - .duration(2 * TICKS).eut(8).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ring)) + .itemOutputs(werkstoff.get(dustSmall, 1)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java index 90ef6d5813..b33d0ddd20 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CrushedLoader.java @@ -49,7 +49,8 @@ public class CrushedLoader implements IWerkstoffRunnable { public void run(Werkstoff werkstoff) { if (!werkstoff.hasItemType(ore) || !werkstoff.hasItemType(dust)) return; - if (werkstoff.hasItemType(ingot) && !werkstoff.getStats().isBlastFurnace()) { + if (werkstoff.hasItemType(ingot) && !werkstoff.getStats() + .isBlastFurnace()) { if (Werkstoff.Types.ELEMENT.equals(werkstoff.getType())) { GT_ModHandler.addSmeltingRecipe(werkstoff.get(crushed), werkstoff.get(nugget, 10)); GT_ModHandler.addSmeltingRecipe(werkstoff.get(crushedPurified), werkstoff.get(nugget, 10)); @@ -64,147 +65,217 @@ public class CrushedLoader implements IWerkstoffRunnable { GT_ModHandler.addSmeltingRecipe(werkstoff.get(dust), werkstoff.get(ingot)); } + GT_ModHandler + .addCraftingRecipe(werkstoff.get(dustImpure), new Object[] { "h ", "W ", 'W', werkstoff.get(crushed) }); GT_ModHandler.addCraftingRecipe( - werkstoff.get(dustImpure), - new Object[] { "h ", "W ", 'W', werkstoff.get(crushed) }); + werkstoff.get(dustPure), + new Object[] { "h ", "W ", 'W', werkstoff.get(crushedPurified) }); GT_ModHandler.addCraftingRecipe( - werkstoff.get(dustPure), - new Object[] { "h ", "W ", 'W', werkstoff.get(crushedPurified) }); - GT_ModHandler.addCraftingRecipe( - werkstoff.get(dust), - new Object[] { "h ", "W ", 'W', werkstoff.get(crushedCentrifuged) }); + werkstoff.get(dust), + new Object[] { "h ", "W ", 'W', werkstoff.get(crushedCentrifuged) }); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(crushed)).itemOutputs(werkstoff.get(dustImpure)) - .duration(10 * TICKS).eut(16).addTo(hammerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(crushed)) + .itemOutputs(werkstoff.get(dustImpure)) + .duration(10 * TICKS) + .eut(16) + .addTo(hammerRecipes); GT_ModHandler.addPulverisationRecipe( - werkstoff.get(crushed), - werkstoff.get(dustImpure), - werkstoff.getOreByProduct(0, dust), - 10, - false); + werkstoff.get(crushed), + werkstoff.get(dustImpure), + werkstoff.getOreByProduct(0, dust), + 10, + false); GT_ModHandler.addOreWasherRecipe( - werkstoff.get(crushed), - new int[] { 10000, 1111, 10000 }, - 1000, - werkstoff.get(crushedPurified), - werkstoff.getOreByProduct(0, dust), - GT_OreDictUnificator.get(dust, Materials.Stone, 1L)); + werkstoff.get(crushed), + new int[] { 10000, 1111, 10000 }, + 1000, + werkstoff.get(crushedPurified), + werkstoff.getOreByProduct(0, dust), + GT_OreDictUnificator.get(dust, Materials.Stone, 1L)); GT_ModHandler.addThermalCentrifugeRecipe( - werkstoff.get(crushed), - new int[] { 10000, 1111, 10000 }, - (int) Math.min(5000L, Math.abs(werkstoff.getStats().getProtons() * 20L)), - werkstoff.get(crushedCentrifuged), - werkstoff.getOreByProduct(1, dust), - GT_OreDictUnificator.get(dust, Materials.Stone, 1L)); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(crushedPurified)).itemOutputs(werkstoff.get(dustPure)) - .duration(10 * TICKS).eut(16).addTo(hammerRecipes); + werkstoff.get(crushed), + new int[] { 10000, 1111, 10000 }, + (int) Math.min( + 5000L, + Math.abs( + werkstoff.getStats() + .getProtons() * 20L)), + werkstoff.get(crushedCentrifuged), + werkstoff.getOreByProduct(1, dust), + GT_OreDictUnificator.get(dust, Materials.Stone, 1L)); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(crushedPurified)) + .itemOutputs(werkstoff.get(dustPure)) + .duration(10 * TICKS) + .eut(16) + .addTo(hammerRecipes); GT_ModHandler.addPulverisationRecipe( - werkstoff.get(crushedPurified), - werkstoff.get(dustPure), - werkstoff.getOreByProduct(1, dust), - 10, - false); + werkstoff.get(crushedPurified), + werkstoff.get(dustPure), + werkstoff.getOreByProduct(1, dust), + 10, + false); GT_ModHandler.addThermalCentrifugeRecipe( - werkstoff.get(crushedPurified), - new int[] { 10000, 1111 }, - (int) Math.min(5000L, Math.abs(werkstoff.getStats().getProtons() * 20L)), - werkstoff.get(crushedCentrifuged), - werkstoff.getOreByProduct(1, dust)); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(crushedCentrifuged)).itemOutputs(werkstoff.get(dust)) - .duration(10 * TICKS).eut(16).addTo(hammerRecipes); + werkstoff.get(crushedPurified), + new int[] { 10000, 1111 }, + (int) Math.min( + 5000L, + Math.abs( + werkstoff.getStats() + .getProtons() * 20L)), + werkstoff.get(crushedCentrifuged), + werkstoff.getOreByProduct(1, dust)); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(crushedCentrifuged)) + .itemOutputs(werkstoff.get(dust)) + .duration(10 * TICKS) + .eut(16) + .addTo(hammerRecipes); GT_ModHandler.addPulverisationRecipe( - werkstoff.get(crushedCentrifuged), - werkstoff.get(dust), - werkstoff.getOreByProduct(2, dust), - 10, - false); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustImpure)) - .itemOutputs(werkstoff.get(dust), werkstoff.getOreByProduct(0, dust)).outputChances(100_00, 11_11) - .duration(Math.max(1L, werkstoff.getStats().getMass() * 8L)).eut(5).addTo(centrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustPure)) - .itemOutputs(werkstoff.get(dust), werkstoff.getOreByProduct(1, dust)).outputChances(100_00, 11_11) - .duration(Math.max(1L, werkstoff.getStats().getMass() * 8L)).eut(5).addTo(centrifugeRecipes); + werkstoff.get(crushedCentrifuged), + werkstoff.get(dust), + werkstoff.getOreByProduct(2, dust), + 10, + false); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustImpure)) + .itemOutputs(werkstoff.get(dust), werkstoff.getOreByProduct(0, dust)) + .outputChances(100_00, 11_11) + .duration( + Math.max( + 1L, + werkstoff.getStats() + .getMass() * 8L)) + .eut(5) + .addTo(centrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustPure)) + .itemOutputs(werkstoff.get(dust), werkstoff.getOreByProduct(1, dust)) + .outputChances(100_00, 11_11) + .duration( + Math.max( + 1L, + werkstoff.getStats() + .getMass() * 8L)) + .eut(5) + .addTo(centrifugeRecipes); if (werkstoff.contains(SubTag.CRYSTALLISABLE)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustPure)).itemOutputs(werkstoff.get(gem)) - .outputChances(9000).fluidInputs(Materials.Water.getFluid(200L)) - .duration(1 * MINUTES + 40 * SECONDS).eut(24).addTo(autoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustImpure)).itemOutputs(werkstoff.get(gem)) - .outputChances(9000).fluidInputs(Materials.Water.getFluid(200L)) - .duration(1 * MINUTES + 40 * SECONDS).eut(24).addTo(autoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustPure)).itemOutputs(werkstoff.get(gem)) - .outputChances(9500).fluidInputs(gregtech.api.util.GT_ModHandler.getDistilledWater(200L)) - .duration(1 * MINUTES + 15 * SECONDS).eut(24).addTo(autoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustImpure)).itemOutputs(werkstoff.get(gem)) - .outputChances(9500).fluidInputs(gregtech.api.util.GT_ModHandler.getDistilledWater(200L)) - .duration(1 * MINUTES + 15 * SECONDS).eut(24).addTo(autoclaveRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustPure)) + .itemOutputs(werkstoff.get(gem)) + .outputChances(9000) + .fluidInputs(Materials.Water.getFluid(200L)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(24) + .addTo(autoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustImpure)) + .itemOutputs(werkstoff.get(gem)) + .outputChances(9000) + .fluidInputs(Materials.Water.getFluid(200L)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(24) + .addTo(autoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustPure)) + .itemOutputs(werkstoff.get(gem)) + .outputChances(9500) + .fluidInputs(gregtech.api.util.GT_ModHandler.getDistilledWater(200L)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(24) + .addTo(autoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustImpure)) + .itemOutputs(werkstoff.get(gem)) + .outputChances(9500) + .fluidInputs(gregtech.api.util.GT_ModHandler.getDistilledWater(200L)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(24) + .addTo(autoclaveRecipes); } if (werkstoff.contains(SubTag.WASHING_MERCURY)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(crushed)) - .itemOutputs( - werkstoff.get(crushedPurified), - werkstoff.getOreByProduct(1, dust), - GT_OreDictUnificator.get(dust, Materials.Stone, 1L)) - .outputChances(10000, 7000, 4000).fluidInputs(Materials.Mercury.getFluid(1000L)) - .duration(40 * SECONDS).eut(8).addTo(chemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(crushed)) + .itemOutputs( + werkstoff.get(crushedPurified), + werkstoff.getOreByProduct(1, dust), + GT_OreDictUnificator.get(dust, Materials.Stone, 1L)) + .outputChances(10000, 7000, 4000) + .fluidInputs(Materials.Mercury.getFluid(1000L)) + .duration(40 * SECONDS) + .eut(8) + .addTo(chemicalBathRecipes); } if (werkstoff.contains(SubTag.WASHING_SODIUMPERSULFATE)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(crushed)) - .itemOutputs( - werkstoff.get(crushedPurified), - werkstoff.getOreByProduct(1, dust), - GT_OreDictUnificator.get(dust, Materials.Stone, 1L)) - .outputChances(10000, 7000, 4000) - .fluidInputs( - Materials.SodiumPersulfate - .getFluid(GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L)) - .duration(40 * SECONDS).eut(8).addTo(chemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(crushed)) + .itemOutputs( + werkstoff.get(crushedPurified), + werkstoff.getOreByProduct(1, dust), + GT_OreDictUnificator.get(dust, Materials.Stone, 1L)) + .outputChances(10000, 7000, 4000) + .fluidInputs( + Materials.SodiumPersulfate.getFluid(GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L)) + .duration(40 * SECONDS) + .eut(8) + .addTo(chemicalBathRecipes); } if (werkstoff.contains(SubTag.ELECTROMAGNETIC_SEPERATION_GOLD)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustPure)) - .itemOutputs( - werkstoff.get(dust), - GT_OreDictUnificator.get(dustSmall, Materials.Gold, 1L), - GT_OreDictUnificator.get(nugget, Materials.Gold, 1L)) - .outputChances(10000, 4000, 2000).duration(20 * SECONDS).eut(24) - .addTo(electroMagneticSeparatorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustPure)) + .itemOutputs( + werkstoff.get(dust), + GT_OreDictUnificator.get(dustSmall, Materials.Gold, 1L), + GT_OreDictUnificator.get(nugget, Materials.Gold, 1L)) + .outputChances(10000, 4000, 2000) + .duration(20 * SECONDS) + .eut(24) + .addTo(electroMagneticSeparatorRecipes); } else if (werkstoff.contains(SubTag.ELECTROMAGNETIC_SEPERATION_IRON)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustPure)) - .itemOutputs( - werkstoff.get(dust), - GT_OreDictUnificator.get(dustSmall, Materials.Iron, 1L), - GT_OreDictUnificator.get(nugget, Materials.Iron, 1L)) - .outputChances(10000, 4000, 2000).duration(20 * SECONDS).eut(24) - .addTo(electroMagneticSeparatorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustPure)) + .itemOutputs( + werkstoff.get(dust), + GT_OreDictUnificator.get(dustSmall, Materials.Iron, 1L), + GT_OreDictUnificator.get(nugget, Materials.Iron, 1L)) + .outputChances(10000, 4000, 2000) + .duration(20 * SECONDS) + .eut(24) + .addTo(electroMagneticSeparatorRecipes); } else if (werkstoff.contains(SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustPure)) - .itemOutputs( - werkstoff.get(dust), - GT_OreDictUnificator.get(dustSmall, Materials.Neodymium, 1L), - GT_OreDictUnificator.get(nugget, Materials.Neodymium, 1L)) - .outputChances(10000, 4000, 2000).duration(20 * SECONDS).eut(24) - .addTo(electroMagneticSeparatorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustPure)) + .itemOutputs( + werkstoff.get(dust), + GT_OreDictUnificator.get(dustSmall, Materials.Neodymium, 1L), + GT_OreDictUnificator.get(nugget, Materials.Neodymium, 1L)) + .outputChances(10000, 4000, 2000) + .duration(20 * SECONDS) + .eut(24) + .addTo(electroMagneticSeparatorRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java index 6c63c12f17..088c4bb55b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java @@ -66,16 +66,22 @@ public class DustLoader implements IWerkstoffRunnable { HashMap<ISubTagContainer, Pair<Integer, Integer>> tracker = new HashMap<>(); int cells = 0; - if (werkstoff.getGenerationFeatures().hasMixerRecipes() || werkstoff.getStats().isElektrolysis() - || werkstoff.getStats().isCentrifuge() - || werkstoff.getGenerationFeatures().hasChemicalRecipes()) { - for (Pair<ISubTagContainer, Integer> container : werkstoff.getContents().getValue() - .toArray(new Pair[0])) { + if (werkstoff.getGenerationFeatures() + .hasMixerRecipes() + || werkstoff.getStats() + .isElektrolysis() + || werkstoff.getStats() + .isCentrifuge() + || werkstoff.getGenerationFeatures() + .hasChemicalRecipes()) { + for (Pair<ISubTagContainer, Integer> container : werkstoff.getContents() + .getValue() + .toArray(new Pair[0])) { final ISubTagContainer key = container.getKey(); final int value = container.getValue(); if (key instanceof Materials materialKey) { if ((materialKey.getGas(0) != null || materialKey.getFluid(0) != null - || materialKey.mIconSet == TextureSet.SET_FLUID) && materialKey.getDust(0) == null) { + || materialKey.mIconSet == TextureSet.SET_FLUID) && materialKey.getDust(0) == null) { FluidStack tmpFl = materialKey.getGas(1000L * value); if (tmpFl == null || tmpFl.getFluid() == null) { tmpFl = materialKey.getFluid(1000L * value); @@ -86,16 +92,20 @@ public class DustLoader implements IWerkstoffRunnable { stOutputs.add(materialKey.getCells(value)); tracker.put(key, new Pair<>(value, stOutputs.size() - 1)); } else { - stOutputs.add(materialKey.getCells(tracker.get(key).getKey() + value)); - stOutputs.remove(tracker.get(key).getValue() + 1); + stOutputs.add( + materialKey.getCells( + tracker.get(key) + .getKey() + value)); + stOutputs.remove( + tracker.get(key) + .getValue() + 1); } cells += value; } } else { if (materialKey.getDust(value) == null) { if (materialKey.getCells(value) == null - || materialKey.getMolten(0) == null && materialKey.getSolid(0) == null) - continue; + || materialKey.getMolten(0) == null && materialKey.getSolid(0) == null) continue; FluidStack tmpFl = materialKey.getMolten(1000L * value); if (tmpFl == null || tmpFl.getFluid() == null) { tmpFl = materialKey.getSolid(1000L * value); @@ -106,8 +116,13 @@ public class DustLoader implements IWerkstoffRunnable { stOutputs.add(materialKey.getCells(value)); tracker.put(key, new Pair<>(value, stOutputs.size() - 1)); } else { - stOutputs.add(materialKey.getCells(tracker.get(key).getKey() + value)); - stOutputs.remove(tracker.get(key).getValue() + 1); + stOutputs.add( + materialKey.getCells( + tracker.get(key) + .getKey() + value)); + stOutputs.remove( + tracker.get(key) + .getValue() + 1); } cells += value; } @@ -116,12 +131,18 @@ public class DustLoader implements IWerkstoffRunnable { stOutputs.add(materialKey.getDust(value)); tracker.put(key, new Pair<>(value, stOutputs.size() - 1)); } else { - stOutputs.add(materialKey.getDust(tracker.get(key).getKey() + value)); - stOutputs.remove(tracker.get(key).getValue() + 1); + stOutputs.add( + materialKey.getDust( + tracker.get(key) + .getKey() + value)); + stOutputs.remove( + tracker.get(key) + .getValue() + 1); } } } else if (key instanceof Werkstoff werkstoffKey) { - if (werkstoffKey.getStats().isGas() || werkstoffKey.hasItemType(cell)) { + if (werkstoffKey.getStats() + .isGas() || werkstoffKey.hasItemType(cell)) { FluidStack tmpFl = werkstoffKey.getFluidOrGas(1000 * value); if (tmpFl == null || tmpFl.getFluid() == null) { tmpFl = werkstoffKey.getFluidOrGas(1000 * value); @@ -132,8 +153,14 @@ public class DustLoader implements IWerkstoffRunnable { stOutputs.add(werkstoffKey.get(cell, value)); tracker.put(key, new Pair<>(value, stOutputs.size() - 1)); } else { - stOutputs.add(werkstoffKey.get(cell, tracker.get(key).getKey() + value)); - stOutputs.remove(tracker.get(key).getValue() + 1); + stOutputs.add( + werkstoffKey.get( + cell, + tracker.get(key) + .getKey() + value)); + stOutputs.remove( + tracker.get(key) + .getValue() + 1); } cells += value; } @@ -143,103 +170,134 @@ public class DustLoader implements IWerkstoffRunnable { stOutputs.add(werkstoffKey.get(dust, value)); tracker.put(key, new Pair<>(value, stOutputs.size() - 1)); } else { - stOutputs.add(werkstoffKey.get(dust, tracker.get(key).getKey() + value)); - stOutputs.remove(tracker.get(key).getValue() + 1); + stOutputs.add( + werkstoffKey.get( + dust, + tracker.get(key) + .getKey() + value)); + stOutputs.remove( + tracker.get(key) + .getValue() + 1); } } } } ItemStack input = werkstoff.get(dust); - input.stackSize = werkstoff.getContents().getKey(); - if (werkstoff.getStats().isElektrolysis()) { + input.stackSize = werkstoff.getContents() + .getKey(); + if (werkstoff.getStats() + .isElektrolysis()) { GT_Recipe tRecipe = new GT_Recipe( - true, - new ItemStack[] { input, cells > 0 ? Materials.Empty.getCells(cells) : null }, - stOutputs.toArray(new ItemStack[0]), - null, - null, - new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, - (int) Math.max( - 1L, - Math.abs( - werkstoff.getStats().getProtons() - / werkstoff.getContents().getValue().size())), - Math.min(4, werkstoff.getContents().getValue().size()) * 30, - 0); + true, + new ItemStack[] { input, cells > 0 ? Materials.Empty.getCells(cells) : null }, + stOutputs.toArray(new ItemStack[0]), + null, + null, + new FluidStack[] { null }, + new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + (int) Math.max( + 1L, + Math.abs( + werkstoff.getStats() + .getProtons() + / werkstoff.getContents() + .getValue() + .size())), + Math.min( + 4, + werkstoff.getContents() + .getValue() + .size()) + * 30, + 0); RecipeMaps.electrolyzerRecipes.add(tRecipe); RecipeMaps.electrolyzerNonCellRecipes.add(tRecipe); } - if (werkstoff.getStats().isCentrifuge()) { + if (werkstoff.getStats() + .isCentrifuge()) { RecipeMaps.centrifugeRecipes.add( - new GT_Recipe( - true, - new ItemStack[] { input, cells > 0 ? Materials.Empty.getCells(cells) : null }, - stOutputs.toArray(new ItemStack[0]), - null, - null, - new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, - (int) Math.max( - 1L, - Math.abs( - werkstoff.getStats().getMass() - / werkstoff.getContents().getValue().size())), - Math.min(4, werkstoff.getContents().getValue().size()) * 5, - 0)); - GT_Recipe tRecipe = new GT_Recipe( - false, + new GT_Recipe( + true, + new ItemStack[] { input, cells > 0 ? Materials.Empty.getCells(cells) : null }, stOutputs.toArray(new ItemStack[0]), - new ItemStack[] { input }, null, null, + new FluidStack[] { null }, new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, - null, (int) Math.max( - 1L, - Math.abs( - werkstoff.getStats().getProtons() - / werkstoff.getContents().getValue().size())), - Math.min(4, werkstoff.getContents().getValue().size()) * 30, - 0); + 1L, + Math.abs( + werkstoff.getStats() + .getMass() + / werkstoff.getContents() + .getValue() + .size())), + Math.min( + 4, + werkstoff.getContents() + .getValue() + .size()) + * 5, + 0)); + GT_Recipe tRecipe = new GT_Recipe( + false, + stOutputs.toArray(new ItemStack[0]), + new ItemStack[] { input }, + null, + null, + new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + null, + (int) Math.max( + 1L, + Math.abs( + werkstoff.getStats() + .getProtons() + / werkstoff.getContents() + .getValue() + .size())), + Math.min( + 4, + werkstoff.getContents() + .getValue() + .size()) + * 30, + 0); RecipeMaps.centrifugeNonCellRecipes.add(tRecipe); } - if (werkstoff.getGenerationFeatures().hasChemicalRecipes()) { + if (werkstoff.getGenerationFeatures() + .hasChemicalRecipes()) { if (cells > 0) stOutputs.add(Materials.Empty.getCells(cells)); - GT_Values.RA.stdBuilder().itemInputs(stOutputs.toArray(new ItemStack[0])).itemOutputs(input) - .fluidInputs(flOutputs.toArray(new FluidStack[0])) - .duration( - (int) Math.max( - 1L, - Math.abs( - werkstoff.getStats().getProtons() - / werkstoff.getContents().getValue().size()))) - .eut(Math.min(4, werkstoff.getContents().getValue().size()) * 30) - .addTo(GT_RecipeConstants.UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(stOutputs.toArray(new ItemStack[0])) + .itemOutputs(input) + .fluidInputs(flOutputs.toArray(new FluidStack[0])) + .duration( + (int) Math.max( + 1L, + Math.abs( + werkstoff.getStats() + .getProtons() + / werkstoff.getContents() + .getValue() + .size()))) + .eut( + Math.min( + 4, + werkstoff.getContents() + .getValue() + .size()) + * 30) + .addTo(GT_RecipeConstants.UniversalChemical); } - if (werkstoff.getGenerationFeatures().hasMixerRecipes()) { + if (werkstoff.getGenerationFeatures() + .hasMixerRecipes()) { if (cells > 0) stOutputs.add(Materials.Empty.getCells(cells)); short circuitID = werkstoff.getMixCircuit(); ItemStack circuit = circuitID == -1 ? null : GT_Utility.getIntegratedCircuit(circuitID); if (circuit != null) stOutputs.add(circuit); RecipeMaps.mixerRecipes.add( - new GT_Recipe( - true, - stOutputs.toArray(new ItemStack[0]), - new ItemStack[] { input }, - null, - null, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, - null, - (int) Math.max( - 1L, - Math.abs( - werkstoff.getStats().getMass() - / werkstoff.getContents().getValue().size())), - Math.min(4, werkstoff.getContents().getValue().size()) * 5, - 0)); - GT_Recipe tRecipe = new GT_Recipe( - false, + new GT_Recipe( + true, stOutputs.toArray(new ItemStack[0]), new ItemStack[] { input }, null, @@ -247,118 +305,223 @@ public class DustLoader implements IWerkstoffRunnable { new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, null, (int) Math.max( - 1L, - Math.abs( - werkstoff.getStats().getProtons() - / werkstoff.getContents().getValue().size())), - Math.min(4, werkstoff.getContents().getValue().size()) * 30, - 0); + 1L, + Math.abs( + werkstoff.getStats() + .getMass() + / werkstoff.getContents() + .getValue() + .size())), + Math.min( + 4, + werkstoff.getContents() + .getValue() + .size()) + * 5, + 0)); + GT_Recipe tRecipe = new GT_Recipe( + false, + stOutputs.toArray(new ItemStack[0]), + new ItemStack[] { input }, + null, + null, + new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + null, + (int) Math.max( + 1L, + Math.abs( + werkstoff.getStats() + .getProtons() + / werkstoff.getContents() + .getValue() + .size())), + Math.min( + 4, + werkstoff.getContents() + .getValue() + .size()) + * 30, + 0); RecipeMaps.mixerNonCellRecipes.add(tRecipe); } } GT_ModHandler.addCraftingRecipe( - werkstoff.get(dust), - new Object[] { "TTT", "TTT", "TTT", 'T', werkstoff.get(dustTiny) }); + werkstoff.get(dust), + new Object[] { "TTT", "TTT", "TTT", 'T', werkstoff.get(dustTiny) }); GT_ModHandler.addCraftingRecipe( - werkstoff.get(dust), - new Object[] { "TT ", "TT ", 'T', - WerkstoffLoader.getCorrespondingItemStack(dustSmall, werkstoff) }); + werkstoff.get(dust), + new Object[] { "TT ", "TT ", 'T', WerkstoffLoader.getCorrespondingItemStack(dustSmall, werkstoff) }); GT_ModHandler.addCraftingRecipe( - WerkstoffLoader.getCorrespondingItemStack(dustSmall, werkstoff, 4), - new Object[] { " T ", 'T', werkstoff.get(dust) }); + WerkstoffLoader.getCorrespondingItemStack(dustSmall, werkstoff, 4), + new Object[] { " T ", 'T', werkstoff.get(dust) }); GT_ModHandler.addCraftingRecipe( - WerkstoffLoader.getCorrespondingItemStack(dustTiny, werkstoff, 9), - new Object[] { "T ", 'T', werkstoff.get(dust) }); + WerkstoffLoader.getCorrespondingItemStack(dustTiny, werkstoff, 9), + new Object[] { "T ", 'T', werkstoff.get(dust) }); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustTiny, 9), ItemList.Schematic_Dust.get(0L)) - .itemOutputs(werkstoff.get(dust)).duration(5 * SECONDS).eut(4).addTo(packagerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustTiny, 9), ItemList.Schematic_Dust.get(0L)) + .itemOutputs(werkstoff.get(dust)) + .duration(5 * SECONDS) + .eut(4) + .addTo(packagerRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustSmall, 4), ItemList.Schematic_Dust.get(0L)) - .itemOutputs(werkstoff.get(dust)).duration(5 * SECONDS).eut(4).addTo(packagerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustSmall, 4), ItemList.Schematic_Dust.get(0L)) + .itemOutputs(werkstoff.get(dust)) + .duration(5 * SECONDS) + .eut(4) + .addTo(packagerRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustTiny, 9), ItemList.Schematic_3by3.get(0L)) - .itemOutputs(werkstoff.get(dust)).duration(5 * SECONDS).eut(4).addTo(packagerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustTiny, 9), ItemList.Schematic_3by3.get(0L)) + .itemOutputs(werkstoff.get(dust)) + .duration(5 * SECONDS) + .eut(4) + .addTo(packagerRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustSmall, 4), ItemList.Schematic_2by2.get(0L)) - .itemOutputs(werkstoff.get(dust)).duration(5 * SECONDS).eut(4).addTo(packagerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustSmall, 4), ItemList.Schematic_2by2.get(0L)) + .itemOutputs(werkstoff.get(dust)) + .duration(5 * SECONDS) + .eut(4) + .addTo(packagerRecipes); - if (werkstoff.hasItemType(ingot) && !werkstoff.getStats().isBlastFurnace()) { + if (werkstoff.hasItemType(ingot) && !werkstoff.getStats() + .isBlastFurnace()) { GT_ModHandler.addSmeltingRecipe(werkstoff.get(dust), werkstoff.get(ingot)); GT_ModHandler.addSmeltingRecipe(werkstoff.get(dustTiny), werkstoff.get(nugget)); - } else if (werkstoff.hasItemType(ingot) && werkstoff.getStats().isBlastFurnace() - && werkstoff.getStats().getMeltingPoint() != 0) { + } else if (werkstoff.hasItemType(ingot) && werkstoff.getStats() + .isBlastFurnace() + && werkstoff.getStats() + .getMeltingPoint() != 0) { if (werkstoff.contains(WerkstoffLoader.ANAEROBE_SMELTING)) { GT_Values.RA.stdBuilder() - .itemInputs(werkstoff.get(dust), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs( - werkstoff.getStats().getMeltingPoint() < 1750 ? werkstoff.get(ingot) - : werkstoff.get(ingotHot)) - .fluidInputs(Materials.Nitrogen.getGas(1000)) - .duration( - Math.max(werkstoff.getStats().getMass() / 40L, 1L) - * werkstoff.getStats().getMeltingPoint()) - .eut(werkstoff.getStats().getMeltingVoltage()) - .metadata(COIL_HEAT, werkstoff.getStats().getMeltingPoint()) - .addTo(blastFurnaceRecipes); + .itemInputs(werkstoff.get(dust), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs( + werkstoff.getStats() + .getMeltingPoint() < 1750 ? werkstoff.get(ingot) : werkstoff.get(ingotHot)) + .fluidInputs(Materials.Nitrogen.getGas(1000)) + .duration( + Math.max( + werkstoff.getStats() + .getMass() / 40L, + 1L) + * werkstoff.getStats() + .getMeltingPoint()) + .eut( + werkstoff.getStats() + .getMeltingVoltage()) + .metadata( + COIL_HEAT, + werkstoff.getStats() + .getMeltingPoint()) + .addTo(blastFurnaceRecipes); } else if (werkstoff.contains(WerkstoffLoader.NOBLE_GAS_SMELTING)) { GT_Values.RA.stdBuilder() - .itemInputs(werkstoff.get(dust), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs( - werkstoff.getStats().getMeltingPoint() < 1750 ? werkstoff.get(ingot) - : werkstoff.get(ingotHot)) - .fluidInputs(Materials.Argon.getGas(1000)) - .duration( - Math.max(werkstoff.getStats().getMass() / 40L, 1L) - * werkstoff.getStats().getMeltingPoint()) - .eut(werkstoff.getStats().getMeltingVoltage()) - .metadata(COIL_HEAT, werkstoff.getStats().getMeltingPoint()) - .addTo(blastFurnaceRecipes); + .itemInputs(werkstoff.get(dust), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs( + werkstoff.getStats() + .getMeltingPoint() < 1750 ? werkstoff.get(ingot) : werkstoff.get(ingotHot)) + .fluidInputs(Materials.Argon.getGas(1000)) + .duration( + Math.max( + werkstoff.getStats() + .getMass() / 40L, + 1L) + * werkstoff.getStats() + .getMeltingPoint()) + .eut( + werkstoff.getStats() + .getMeltingVoltage()) + .metadata( + COIL_HEAT, + werkstoff.getStats() + .getMeltingPoint()) + .addTo(blastFurnaceRecipes); } else { GT_Values.RA.stdBuilder() - .itemInputs(werkstoff.get(dust), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - werkstoff.getStats().getMeltingPoint() < 1750 ? werkstoff.get(ingot) - : werkstoff.get(ingotHot)) - .duration( - Math.max(werkstoff.getStats().getMass() / 40L, 1L) - * werkstoff.getStats().getMeltingPoint()) - .eut(werkstoff.getStats().getMeltingVoltage()) - .metadata(COIL_HEAT, werkstoff.getStats().getMeltingPoint()) - .addTo(blastFurnaceRecipes); + .itemInputs(werkstoff.get(dust), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + werkstoff.getStats() + .getMeltingPoint() < 1750 ? werkstoff.get(ingot) : werkstoff.get(ingotHot)) + .duration( + Math.max( + werkstoff.getStats() + .getMass() / 40L, + 1L) + * werkstoff.getStats() + .getMeltingPoint()) + .eut( + werkstoff.getStats() + .getMeltingVoltage()) + .metadata( + COIL_HEAT, + werkstoff.getStats() + .getMeltingPoint()) + .addTo(blastFurnaceRecipes); - if (werkstoff.getStats().getMeltingPoint() <= 1000) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dust)) - .itemOutputs(werkstoff.get(ingot)) - .duration( - (int) Math.max(werkstoff.getStats().getMass() / 40L, 1L) - * werkstoff.getStats().getMeltingPoint()) - .eut(0).metadata(ADDITIVE_AMOUNT, 9).addTo(primitiveBlastRecipes); + if (werkstoff.getStats() + .getMeltingPoint() <= 1000) { + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dust)) + .itemOutputs(werkstoff.get(ingot)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() / 40L, + 1L) * werkstoff.getStats() + .getMeltingPoint()) + .eut(0) + .metadata(ADDITIVE_AMOUNT, 9) + .addTo(primitiveBlastRecipes); } } } - if (werkstoff.getStats().isBlastFurnace() && werkstoff.getStats().getMeltingPoint() > 1750) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingotHot)).itemOutputs(werkstoff.get(ingot)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 3L, 1L)).eut(TierEU.RECIPE_MV) - .addTo(vacuumFreezerRecipes); + if (werkstoff.getStats() + .isBlastFurnace() + && werkstoff.getStats() + .getMeltingPoint() > 1750) { + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingotHot)) + .itemOutputs(werkstoff.get(ingot)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 3L, + 1L)) + .eut(TierEU.RECIPE_MV) + .addTo(vacuumFreezerRecipes); } if (werkstoff.hasItemType(ingot)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot)).itemOutputs(werkstoff.get(dust)) - .duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot)) + .itemOutputs(werkstoff.get(dust)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(nugget)).itemOutputs(werkstoff.get(dustTiny)) - .duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(nugget)) + .itemOutputs(werkstoff.get(dustTiny)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); } if (werkstoff.hasItemType(ingot) || werkstoff.hasItemType(gem)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(block)).itemOutputs(werkstoff.get(dust, 9)) - .duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(block)) + .itemOutputs(werkstoff.get(dust, 9)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java index c58b1a0241..187456a3b4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/GemLoader.java @@ -61,149 +61,234 @@ public class GemLoader implements IWerkstoffRunnable { @Override public void run(Werkstoff werkstoff) { if (werkstoff.hasItemType(gem)) { - if (werkstoff.getGenerationFeatures().hasSifterRecipes() - || werkstoff.hasItemType(ore) && werkstoff.hasItemType(dust)) { - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gem, 9)).itemOutputs(werkstoff.get(block)) - .duration(15 * SECONDS).eut(2).addTo(compressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(block)).itemOutputs(werkstoff.get(gem, 9)) - .duration(5 * SECONDS).eut(24).addTo(hammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(crushedPurified)) - .itemOutputs( - werkstoff.get(gemExquisite), - werkstoff.get(gemFlawless), - werkstoff.get(gem), - werkstoff.get(gemFlawed), - werkstoff.get(gemChipped), - werkstoff.get(dust)) - .outputChances(200, 1000, 2500, 2000, 4000, 5000).duration(40 * SECONDS).eut(16) - .addTo(sifterRecipes); + if (werkstoff.getGenerationFeatures() + .hasSifterRecipes() || werkstoff.hasItemType(ore) && werkstoff.hasItemType(dust)) { + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gem, 9)) + .itemOutputs(werkstoff.get(block)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(block)) + .itemOutputs(werkstoff.get(gem, 9)) + .duration(5 * SECONDS) + .eut(24) + .addTo(hammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(crushedPurified)) + .itemOutputs( + werkstoff.get(gemExquisite), + werkstoff.get(gemFlawless), + werkstoff.get(gem), + werkstoff.get(gemFlawed), + werkstoff.get(gemChipped), + werkstoff.get(dust)) + .outputChances(200, 1000, 2500, 2000, 4000, 5000) + .duration(40 * SECONDS) + .eut(16) + .addTo(sifterRecipes); } - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemExquisite)).itemOutputs(werkstoff.get(dust, 4)) - .duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemFlawless)).itemOutputs(werkstoff.get(dust, 2)) - .duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gem)).itemOutputs(werkstoff.get(dust)) - .duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemFlawed)).itemOutputs(werkstoff.get(dustSmall, 2)) - .duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemChipped)).itemOutputs(werkstoff.get(dustSmall)) - .duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemExquisite)) + .itemOutputs(werkstoff.get(dust, 4)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemFlawless)) + .itemOutputs(werkstoff.get(dust, 2)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gem)) + .itemOutputs(werkstoff.get(dust)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemFlawed)) + .itemOutputs(werkstoff.get(dustSmall, 2)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemChipped)) + .itemOutputs(werkstoff.get(dustSmall)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); GT_ModHandler.addCraftingRecipe( - werkstoff.get(gemFlawless, 2), - 0, - new Object[] { "h ", "W ", 'W', werkstoff.get(gemExquisite) }); + werkstoff.get(gemFlawless, 2), + 0, + new Object[] { "h ", "W ", 'W', werkstoff.get(gemExquisite) }); GT_ModHandler.addCraftingRecipe( - werkstoff.get(gem, 2), - 0, - new Object[] { "h ", "W ", 'W', werkstoff.get(gemFlawless) }); + werkstoff.get(gem, 2), + 0, + new Object[] { "h ", "W ", 'W', werkstoff.get(gemFlawless) }); GT_ModHandler.addCraftingRecipe( - werkstoff.get(gemFlawed, 2), - 0, - new Object[] { "h ", "W ", 'W', werkstoff.get(gem) }); + werkstoff.get(gemFlawed, 2), + 0, + new Object[] { "h ", "W ", 'W', werkstoff.get(gem) }); GT_ModHandler.addCraftingRecipe( - werkstoff.get(gemChipped, 2), - 0, - new Object[] { "h ", "W ", 'W', werkstoff.get(gemFlawed) }); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemExquisite)).itemOutputs(werkstoff.get(gemFlawless, 2)) - .duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(hammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemFlawless)).itemOutputs(werkstoff.get(gem, 2)) - .duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(hammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gem)).itemOutputs(werkstoff.get(gemFlawed, 2)) - .duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(hammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemFlawed)).itemOutputs(werkstoff.get(gemChipped, 2)) - .duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(hammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemChipped)).itemOutputs(werkstoff.get(dustTiny)) - .duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(hammerRecipes); + werkstoff.get(gemChipped, 2), + 0, + new Object[] { "h ", "W ", 'W', werkstoff.get(gemFlawed) }); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemExquisite)) + .itemOutputs(werkstoff.get(gemFlawless, 2)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(hammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemFlawless)) + .itemOutputs(werkstoff.get(gem, 2)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(hammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gem)) + .itemOutputs(werkstoff.get(gemFlawed, 2)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(hammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemFlawed)) + .itemOutputs(werkstoff.get(gemChipped, 2)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(hammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemChipped)) + .itemOutputs(werkstoff.get(dustTiny)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(hammerRecipes); if (!werkstoff.contains(WerkstoffLoader.NO_BLAST)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemFlawless, 3)) - .itemOutputs( - werkstoff.get(gemExquisite), - GT_OreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) - .duration(20 * TICKS).eut(TierEU.RECIPE_LV).metadata(ADDITIVE_AMOUNT, 8) - .addTo(implosionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gem, 3)) - .itemOutputs( - werkstoff.get(gemFlawless), - GT_OreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) - .duration(20 * TICKS).eut(TierEU.RECIPE_LV).metadata(ADDITIVE_AMOUNT, 8) - .addTo(implosionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemFlawed, 3)) - .itemOutputs(werkstoff.get(gem), GT_OreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) - .duration(20 * TICKS).eut(TierEU.RECIPE_LV).metadata(ADDITIVE_AMOUNT, 8) - .addTo(implosionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemChipped, 3)) - .itemOutputs(werkstoff.get(gemFlawed), GT_OreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) - .duration(20 * TICKS).eut(TierEU.RECIPE_LV).metadata(ADDITIVE_AMOUNT, 8) - .addTo(implosionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dust, 4)) - .itemOutputs(werkstoff.get(gem, 3), GT_OreDictUnificator.get(dustTiny, Materials.DarkAsh, 8)) - .duration(20 * TICKS).eut(TierEU.RECIPE_LV).metadata(ADDITIVE_AMOUNT, 24) - .addTo(implosionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemFlawless, 3)) + .itemOutputs(werkstoff.get(gemExquisite), GT_OreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) + .duration(20 * TICKS) + .eut(TierEU.RECIPE_LV) + .metadata(ADDITIVE_AMOUNT, 8) + .addTo(implosionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gem, 3)) + .itemOutputs(werkstoff.get(gemFlawless), GT_OreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) + .duration(20 * TICKS) + .eut(TierEU.RECIPE_LV) + .metadata(ADDITIVE_AMOUNT, 8) + .addTo(implosionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemFlawed, 3)) + .itemOutputs(werkstoff.get(gem), GT_OreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) + .duration(20 * TICKS) + .eut(TierEU.RECIPE_LV) + .metadata(ADDITIVE_AMOUNT, 8) + .addTo(implosionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemChipped, 3)) + .itemOutputs(werkstoff.get(gemFlawed), GT_OreDictUnificator.get(dustTiny, Materials.DarkAsh, 2)) + .duration(20 * TICKS) + .eut(TierEU.RECIPE_LV) + .metadata(ADDITIVE_AMOUNT, 8) + .addTo(implosionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dust, 4)) + .itemOutputs(werkstoff.get(gem, 3), GT_OreDictUnificator.get(dustTiny, Materials.DarkAsh, 8)) + .duration(20 * TICKS) + .eut(TierEU.RECIPE_LV) + .metadata(ADDITIVE_AMOUNT, 24) + .addTo(implosionRecipes); } if (werkstoff.hasItemType(plate)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(plate)) - .itemOutputs(werkstoff.get(lens), werkstoff.get(dustSmall)).duration(60 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(latheRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(plate)) + .itemOutputs(werkstoff.get(lens), werkstoff.get(dustSmall)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(latheRecipes); } - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemExquisite)) - .itemOutputs(werkstoff.get(lens), werkstoff.get(dust, 2)).duration(2 * MINUTES) - .eut(TierEU.RECIPE_LV).addTo(latheRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemExquisite)) + .itemOutputs(werkstoff.get(lens), werkstoff.get(dust, 2)) + .duration(2 * MINUTES) + .eut(TierEU.RECIPE_LV) + .addTo(latheRecipes); final ITexture texture = TextureFactory.of( - Textures.BlockIcons.MACHINE_CASINGS[2][0], - TextureFactory.of(Textures.BlockIcons.OVERLAY_LENS, werkstoff.getRGBA(), false)); + Textures.BlockIcons.MACHINE_CASINGS[2][0], + TextureFactory.of(Textures.BlockIcons.OVERLAY_LENS, werkstoff.getRGBA(), false)); GregTech_API.registerCover( - werkstoff.get(lens), - texture, - new gregtech.common.covers.GT_Cover_Lens( - BW_ColorUtil.getDyeFromColor(werkstoff.getRGBA()).mIndex, - texture)); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(lens)).itemOutputs(werkstoff.get(dustSmall, 3)) - .duration(20 * SECONDS).eut(2).addTo(maceratorRecipes); - - for (ItemStack is : OreDictionary.getOres( - "craftingLens" + BW_ColorUtil.getDyeFromColor(werkstoff.getRGBA()).mName.replace(" ", ""))) { + werkstoff.get(lens), + texture, + new gregtech.common.covers.GT_Cover_Lens( + BW_ColorUtil.getDyeFromColor(werkstoff.getRGBA()).mIndex, + texture)); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(lens)) + .itemOutputs(werkstoff.get(dustSmall, 3)) + .duration(20 * SECONDS) + .eut(2) + .addTo(maceratorRecipes); + + for (ItemStack is : OreDictionary + .getOres("craftingLens" + BW_ColorUtil.getDyeFromColor(werkstoff.getRGBA()).mName.replace(" ", ""))) { is.stackSize = 0; - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemChipped, 3), is) - .itemOutputs(werkstoff.get(gemFlawed, 1)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(laserEngraverRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemFlawed, 3), is).itemOutputs(werkstoff.get(gem, 1)) - .duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(laserEngraverRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gem, 3), is) - .itemOutputs(werkstoff.get(gemFlawless, 1)).duration(60 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(laserEngraverRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gemFlawless, 3), is) - .itemOutputs(werkstoff.get(gemExquisite, 1)).duration(2 * MINUTES).eut(2000) - .addTo(laserEngraverRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemChipped, 3), is) + .itemOutputs(werkstoff.get(gemFlawed, 1)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(laserEngraverRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemFlawed, 3), is) + .itemOutputs(werkstoff.get(gem, 1)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(laserEngraverRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gem, 3), is) + .itemOutputs(werkstoff.get(gemFlawless, 1)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(laserEngraverRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gemFlawless, 3), is) + .itemOutputs(werkstoff.get(gemExquisite, 1)) + .duration(2 * MINUTES) + .eut(2000) + .addTo(laserEngraverRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MetalLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MetalLoader.java index 9447b0f43b..d969ff056f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MetalLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MetalLoader.java @@ -32,17 +32,35 @@ public class MetalLoader implements IWerkstoffRunnable { @Override public void run(Werkstoff werkstoff) { if (werkstoff.hasItemType(ingot)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot, 9)).itemOutputs(werkstoff.get(block)) - .duration(15 * SECONDS).eut(2).addTo(compressorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot, 9)) + .itemOutputs(werkstoff.get(block)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot, 9), ItemList.Shape_Extruder_Block.get(0)) - .itemOutputs(werkstoff.get(block)).duration((int) werkstoff.getStats().getMass()) - .eut(8 * werkstoff.getStats().getMeltingPoint() >= 2800 ? 60 : 15).addTo(extruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot, 9), ItemList.Shape_Extruder_Block.get(0)) + .itemOutputs(werkstoff.get(block)) + .duration( + (int) werkstoff.getStats() + .getMass()) + .eut( + 8 * werkstoff.getStats() + .getMeltingPoint() >= 2800 ? 60 : 15) + .addTo(extruderRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot, 9), ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(werkstoff.get(block)).duration((int) (werkstoff.getStats().getMass() / 2)) - .eut(4 * werkstoff.getStats().getMeltingPoint() >= 2800 ? 60 : 15) - .recipeCategory(RecipeCategories.alloySmelterMolding).addTo(RecipeMaps.alloySmelterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot, 9), ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(werkstoff.get(block)) + .duration( + (int) (werkstoff.getStats() + .getMass() / 2)) + .eut( + 4 * werkstoff.getStats() + .getMeltingPoint() >= 2800 ? 60 : 15) + .recipeCategory(RecipeCategories.alloySmelterMolding) + .addTo(RecipeMaps.alloySmelterRecipes); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java index eca18f2888..86cc6aa732 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java @@ -67,108 +67,239 @@ public class MoltenCellLoader implements IWerkstoffRunnable { return; } - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dust)).fluidOutputs(werkstoff.getMolten(144)) - .duration(15 * SECONDS).eut(2).recipeCategory(RecipeCategories.fluidExtractorRecycling) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustSmall)).fluidOutputs(werkstoff.getMolten(36)) - .duration(15 * SECONDS).eut(2).recipeCategory(RecipeCategories.fluidExtractorRecycling) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(dustTiny)).fluidOutputs(werkstoff.getMolten(16)) - .duration(15 * SECONDS).eut(2).recipeCategory(RecipeCategories.fluidExtractorRecycling) - .addTo(fluidExtractionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dust)) + .fluidOutputs(werkstoff.getMolten(144)) + .duration(15 * SECONDS) + .eut(2) + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustSmall)) + .fluidOutputs(werkstoff.getMolten(36)) + .duration(15 * SECONDS) + .eut(2) + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(dustTiny)) + .fluidOutputs(werkstoff.getMolten(16)) + .duration(15 * SECONDS) + .eut(2) + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); } else { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot)).fluidOutputs(werkstoff.getMolten(144)) - .duration(15 * SECONDS).eut(2).recipeCategory(RecipeCategories.fluidExtractorRecycling) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(nugget)).fluidOutputs(werkstoff.getMolten(16)) - .duration(15 * SECONDS).eut(2).recipeCategory(RecipeCategories.fluidExtractorRecycling) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ingot.get(0)).itemOutputs(werkstoff.get(ingot)) - .fluidInputs(werkstoff.getMolten(144)).duration((int) werkstoff.getStats().getMass()) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Nugget.get(0)).itemOutputs(werkstoff.get(nugget)) - .fluidInputs(werkstoff.getMolten(16)).duration((int) ((double) werkstoff.getStats().getMass() / 9D)) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0)).itemOutputs(werkstoff.get(block)) - .fluidInputs(werkstoff.getMolten(1296)).duration((int) werkstoff.getStats().getMass() * 9) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot)) + .fluidOutputs(werkstoff.getMolten(144)) + .duration(15 * SECONDS) + .eut(2) + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(nugget)) + .fluidOutputs(werkstoff.getMolten(16)) + .duration(15 * SECONDS) + .eut(2) + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ingot.get(0)) + .itemOutputs(werkstoff.get(ingot)) + .fluidInputs(werkstoff.getMolten(144)) + .duration( + (int) werkstoff.getStats() + .getMass()) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Nugget.get(0)) + .itemOutputs(werkstoff.get(nugget)) + .fluidInputs(werkstoff.getMolten(16)) + .duration( + (int) ((double) werkstoff.getStats() + .getMass() / 9D)) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Block.get(0)) + .itemOutputs(werkstoff.get(block)) + .fluidInputs(werkstoff.getMolten(1296)) + .duration( + (int) werkstoff.getStats() + .getMass() * 9) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); if (!werkstoff.hasItemType(plate)) { return; } - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(stickLong)).fluidOutputs(werkstoff.getMolten(144)) - .duration(15 * SECONDS).eut(2).recipeCategory(RecipeCategories.fluidExtractorRecycling) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(plate)).fluidOutputs(werkstoff.getMolten(144)) - .duration(15 * SECONDS).eut(2).recipeCategory(RecipeCategories.fluidExtractorRecycling) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(stick)).fluidOutputs(werkstoff.getMolten(72)) - .duration(15 * SECONDS).eut(2).recipeCategory(RecipeCategories.fluidExtractorRecycling) - .addTo(fluidExtractionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(stickLong)) + .fluidOutputs(werkstoff.getMolten(144)) + .duration(15 * SECONDS) + .eut(2) + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(plate)) + .fluidOutputs(werkstoff.getMolten(144)) + .duration(15 * SECONDS) + .eut(2) + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(stick)) + .fluidOutputs(werkstoff.getMolten(72)) + .duration(15 * SECONDS) + .eut(2) + .recipeCategory(RecipeCategories.fluidExtractorRecycling) + .addTo(fluidExtractionRecipes); } - if (werkstoff.getGenerationFeatures().hasMetalCraftingSolidifierRecipes()) { + if (werkstoff.getGenerationFeatures() + .hasMetalCraftingSolidifierRecipes()) { if (!werkstoff.hasItemType(plate)) { return; } - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Rod_Long.get(0)) - .itemOutputs(werkstoff.get(stickLong)).fluidInputs(werkstoff.getMolten(144)) - .duration((int) Math.max(werkstoff.getStats().getMass(), 1L)) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Rod.get(0)).itemOutputs(werkstoff.get(stick)) - .fluidInputs(werkstoff.getMolten(72)) - .duration((int) Math.max(werkstoff.getStats().getMass() / 2, 1L)) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Plate.get(0)).itemOutputs(werkstoff.get(plate)) - .fluidInputs(werkstoff.getMolten(144)).duration((int) Math.max(werkstoff.getStats().getMass(), 1L)) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Rod_Long.get(0)) + .itemOutputs(werkstoff.get(stickLong)) + .fluidInputs(werkstoff.getMolten(144)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass(), + 1L)) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Rod.get(0)) + .itemOutputs(werkstoff.get(stick)) + .fluidInputs(werkstoff.getMolten(72)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() / 2, + 1L)) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Plate.get(0)) + .itemOutputs(werkstoff.get(plate)) + .fluidInputs(werkstoff.getMolten(144)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass(), + 1L)) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); } - if (werkstoff.getGenerationFeatures().hasMetaSolidifierRecipes()) { + if (werkstoff.getGenerationFeatures() + .hasMetaSolidifierRecipes()) { if (!werkstoff.hasItemType(screw)) { return; } - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Screw.get(0)).itemOutputs(werkstoff.get(screw)) - .fluidInputs(werkstoff.getMolten(18)) - .duration((int) Math.max(werkstoff.getStats().getMass() / 8, 1L)) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Gear.get(0)).itemOutputs(werkstoff.get(gearGt)) - .fluidInputs(werkstoff.getMolten(576)) - .duration((int) Math.max(werkstoff.getStats().getMass() / 4, 1L)) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Gear_Small.get(0)) - .itemOutputs(werkstoff.get(gearGtSmall)).fluidInputs(werkstoff.getMolten(144)) - .duration((int) Math.max(werkstoff.getStats().getMass(), 1L)) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Bolt.get(0)).itemOutputs(werkstoff.get(bolt)) - .fluidInputs(werkstoff.getMolten(18)) - .duration((int) Math.max(werkstoff.getStats().getMass() / 8, 1L)) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ring.get(0)).itemOutputs(werkstoff.get(ring)) - .fluidInputs(werkstoff.getMolten(36)) - .duration((int) Math.max(werkstoff.getStats().getMass() / 4, 1L)) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Screw.get(0)) + .itemOutputs(werkstoff.get(screw)) + .fluidInputs(werkstoff.getMolten(18)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() / 8, + 1L)) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Gear.get(0)) + .itemOutputs(werkstoff.get(gearGt)) + .fluidInputs(werkstoff.getMolten(576)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() / 4, + 1L)) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Gear_Small.get(0)) + .itemOutputs(werkstoff.get(gearGtSmall)) + .fluidInputs(werkstoff.getMolten(144)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass(), + 1L)) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Bolt.get(0)) + .itemOutputs(werkstoff.get(bolt)) + .fluidInputs(werkstoff.getMolten(18)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() / 8, + 1L)) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ring.get(0)) + .itemOutputs(werkstoff.get(ring)) + .fluidInputs(werkstoff.getMolten(36)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() / 4, + 1L)) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); // No Spring Molds @@ -176,53 +307,71 @@ public class MoltenCellLoader implements IWerkstoffRunnable { return; } - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Rotor.get(0)).itemOutputs(werkstoff.get(rotor)) - .fluidInputs(werkstoff.getMolten(612)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 4.25, 1L)) - .eut(werkstoff.getStats().getMass() > 128 ? 64 : 30).addTo(fluidSolidifierRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Rotor.get(0)) + .itemOutputs(werkstoff.get(rotor)) + .fluidInputs(werkstoff.getMolten(612)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 4.25, + 1L)) + .eut( + werkstoff.getStats() + .getMass() > 128 ? 64 : 30) + .addTo(fluidSolidifierRecipes); } - if (werkstoff.getGenerationFeatures().hasMultipleMetalSolidifierRecipes() - && !werkstoff.hasItemType(plateDouble)) { + if (werkstoff.getGenerationFeatures() + .hasMultipleMetalSolidifierRecipes() && !werkstoff.hasItemType(plateDouble)) { // No multiple plate molds return; } // Tank "Recipe" final FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData( - new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), - werkstoff.get(cellMolten), - Materials.Empty.getCells(1)); - FluidContainerRegistry.registerFluidContainer( - werkstoff.getMolten(144), - werkstoff.get(cellMolten), - Materials.Empty.getCells(1)); + new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), + werkstoff.get(cellMolten), + Materials.Empty.getCells(1)); + FluidContainerRegistry + .registerFluidContainer(werkstoff.getMolten(144), werkstoff.get(cellMolten), Materials.Empty.getCells(1)); GT_Utility.addFluidContainerData(data); - GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(1)).itemOutputs(werkstoff.get(cellMolten)) - .fluidInputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144)) - .duration(2 * TICKS).eut(2).addTo(fluidCannerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(cellMolten)).itemOutputs(Materials.Empty.getCells(1)) - .fluidOutputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144)) - .duration(2 * TICKS).eut(2).addTo(fluidCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Empty.getCells(1)) + .itemOutputs(werkstoff.get(cellMolten)) + .fluidInputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144)) + .duration(2 * TICKS) + .eut(2) + .addTo(fluidCannerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(cellMolten)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidOutputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144)) + .duration(2 * TICKS) + .eut(2) + .addTo(fluidCannerRecipes); if (!Forestry.isModLoaded()) return; final FluidContainerRegistry.FluidContainerData emptyData = new FluidContainerRegistry.FluidContainerData( - new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), - werkstoff.get(capsuleMolten), - GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1)); + new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), + werkstoff.get(capsuleMolten), + GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1)); FluidContainerRegistry.registerFluidContainer( - werkstoff.getMolten(144), - werkstoff.get(capsuleMolten), - GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1)); + werkstoff.getMolten(144), + werkstoff.get(capsuleMolten), + GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1)); GT_Utility.addFluidContainerData(emptyData); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(capsuleMolten)) - .fluidOutputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144)) - .duration(2 * TICKS).eut(2).addTo(fluidCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(capsuleMolten)) + .fluidOutputs(new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144)) + .duration(2 * TICKS) + .eut(2) + .addTo(fluidCannerRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java index fa6252c545..5975b7b898 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MultipleMetalLoader.java @@ -38,24 +38,31 @@ public class MultipleMetalLoader implements IWerkstoffRunnable { public void run(Werkstoff werkstoff) { if (werkstoff.hasItemType(plateDense)) { RecipeMaps.benderRecipes.add( - new GT_Recipe( - true, - new ItemStack[] { werkstoff.get(ingot, 2), GT_Utility.getIntegratedCircuit(2) }, - new ItemStack[] { werkstoff.get(plateDouble) }, - null, - null, - null, - null, - (int) Math.max(werkstoff.getStats().getMass() * 2, 1L), - 60, - 0)); + new GT_Recipe( + true, + new ItemStack[] { werkstoff.get(ingot, 2), GT_Utility.getIntegratedCircuit(2) }, + new ItemStack[] { werkstoff.get(plateDouble) }, + null, + null, + null, + null, + (int) Math.max( + werkstoff.getStats() + .getMass() * 2, + 1L), + 60, + 0)); GregTech_API.registerCover( - werkstoff.get(plateDouble), - TextureFactory.of(werkstoff.getTexSet().mTextures[72], werkstoff.getRGBA(), false), - null); + werkstoff.get(plateDouble), + TextureFactory.of(werkstoff.getTexSet().mTextures[72], werkstoff.getRGBA(), false), + null); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(plateDouble)).itemOutputs(werkstoff.get(dust, 2)) - .duration(2 * TICKS).eut(8).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(plateDouble)) + .itemOutputs(werkstoff.get(dust, 2)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java index 581c475956..8c9d3837c9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/OreLoader.java @@ -34,24 +34,29 @@ public class OreLoader implements IWerkstoffRunnable { @Override public void run(Werkstoff werkstoff) { - if (werkstoff.hasItemType(ore) && werkstoff.hasItemType(ingot) && !werkstoff.getStats().isBlastFurnace()) + if (werkstoff.hasItemType(ore) && werkstoff.hasItemType(ingot) + && !werkstoff.getStats() + .isBlastFurnace()) GT_ModHandler - .addSmeltingRecipe(WerkstoffLoader.getCorrespondingItemStack(ore, werkstoff), werkstoff.get(ingot)); + .addSmeltingRecipe(WerkstoffLoader.getCorrespondingItemStack(ore, werkstoff), werkstoff.get(ingot)); if (werkstoff.hasItemType(ore)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ore)) - .itemOutputs(werkstoff.hasItemType(gem) ? werkstoff.get(gem) : werkstoff.get(crushed)) - .duration(16 * TICKS).eut(10).addTo(hammerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ore)) + .itemOutputs(werkstoff.hasItemType(gem) ? werkstoff.get(gem) : werkstoff.get(crushed)) + .duration(16 * TICKS) + .eut(10) + .addTo(hammerRecipes); GT_ModHandler.addPulverisationRecipe( - werkstoff.get(ore), - werkstoff.get(crushed, 2), - werkstoff.contains(SubTag.CRYSTAL) ? werkstoff.get(gem) : werkstoff.getOreByProduct(0, dust), - werkstoff.getNoOfByProducts() > 0 ? 10 : 0, - Materials.Stone.getDust(1), - 50, - true); + werkstoff.get(ore), + werkstoff.get(crushed, 2), + werkstoff.contains(SubTag.CRYSTAL) ? werkstoff.get(gem) : werkstoff.getOreByProduct(0, dust), + werkstoff.getNoOfByProducts() > 0 ? 10 : 0, + Materials.Stone.getDust(1), + 50, + true); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/RawOreLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/RawOreLoader.java index f48d070d2e..2fbb086022 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/RawOreLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/RawOreLoader.java @@ -34,25 +34,29 @@ public class RawOreLoader implements IWerkstoffRunnable { @Override public void run(Werkstoff werkstoff) { - if (werkstoff.hasItemType(rawOre) && werkstoff.hasItemType(ingot) && !werkstoff.getStats().isBlastFurnace()) - GT_ModHandler.addSmeltingRecipe( - WerkstoffLoader.getCorrespondingItemStack(rawOre, werkstoff), - werkstoff.get(ingot)); + if (werkstoff.hasItemType(rawOre) && werkstoff.hasItemType(ingot) + && !werkstoff.getStats() + .isBlastFurnace()) + GT_ModHandler + .addSmeltingRecipe(WerkstoffLoader.getCorrespondingItemStack(rawOre, werkstoff), werkstoff.get(ingot)); if (werkstoff.hasItemType(rawOre)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(rawOre)) - .itemOutputs(werkstoff.hasItemType(gem) ? werkstoff.get(gem) : werkstoff.get(crushed)) - .duration(16 * TICKS).eut(10).addTo(hammerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(rawOre)) + .itemOutputs(werkstoff.hasItemType(gem) ? werkstoff.get(gem) : werkstoff.get(crushed)) + .duration(16 * TICKS) + .eut(10) + .addTo(hammerRecipes); GT_ModHandler.addPulverisationRecipe( - werkstoff.get(rawOre), - werkstoff.get(crushed, 2), - werkstoff.contains(SubTag.CRYSTAL) ? werkstoff.get(gem) : werkstoff.getOreByProduct(0, dust), - werkstoff.getNoOfByProducts() > 0 ? 5 : 0, - Materials.Stone.getDust(1), - 50, - true); + werkstoff.get(rawOre), + werkstoff.get(crushed, 2), + werkstoff.contains(SubTag.CRYSTAL) ? werkstoff.get(gem) : werkstoff.getOreByProduct(0, dust), + werkstoff.getNoOfByProducts() > 0 ? 5 : 0, + Materials.Stone.getDust(1), + 50, + true); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java index 2978c5e3c0..88bfac24ee 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java @@ -54,110 +54,196 @@ public class SimpleMetalLoader implements IWerkstoffRunnable { if (werkstoff.hasItemType(plate)) { if (werkstoff.hasItemType(gem)) { - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(gem)) - .itemOutputs(werkstoff.get(stick), werkstoff.get(dustSmall, 2)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 5L, 1L)).eut(16).addTo(latheRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(gem)) + .itemOutputs(werkstoff.get(stick), werkstoff.get(dustSmall, 2)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 5L, + 1L)) + .eut(16) + .addTo(latheRecipes); GT_ModHandler.addCraftingRecipe( - werkstoff.get(stick, 2), - GT_Proxy.tBits, - new Object[] { "s", "X", 'X', werkstoff.get(stickLong) }); + werkstoff.get(stick, 2), + GT_Proxy.tBits, + new Object[] { "s", "X", 'X', werkstoff.get(stickLong) }); GT_ModHandler.addCraftingRecipe( - werkstoff.get(stick), - GT_Proxy.tBits, - new Object[] { "f ", " X", 'X', werkstoff.get(gem) }); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(stick, 2)).itemOutputs(werkstoff.get(stickLong)) - .duration((int) Math.max(werkstoff.getStats().getMass(), 1L)).eut(16).addTo(hammerRecipes); + werkstoff.get(stick), + GT_Proxy.tBits, + new Object[] { "f ", " X", 'X', werkstoff.get(gem) }); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(stick, 2)) + .itemOutputs(werkstoff.get(stickLong)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass(), + 1L)) + .eut(16) + .addTo(hammerRecipes); TextureSet texSet = werkstoff.getTexSet(); - ITexture texture = SideReference.Side.Client - ? TextureFactory.of( - texSet.mTextures[PrefixTextureLinker.blockTexMap - .getOrDefault(texSet, block.mTextureIndex)], - werkstoff.getRGBA(), - false) - : TextureFactory.of(texSet.mTextures[block.mTextureIndex], werkstoff.getRGBA(), false); + ITexture texture = SideReference.Side.Client ? TextureFactory.of( + texSet.mTextures[PrefixTextureLinker.blockTexMap.getOrDefault(texSet, block.mTextureIndex)], + werkstoff.getRGBA(), + false) : TextureFactory.of(texSet.mTextures[block.mTextureIndex], werkstoff.getRGBA(), false); GregTech_API.registerCover(werkstoff.get(plate), texture, null); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(plate)).itemOutputs(werkstoff.get(dust)) - .duration(2 * TICKS).eut(8).addTo(maceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(plate)) + .itemOutputs(werkstoff.get(dust)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); return; } GT_ModHandler.addCraftingRecipe( - werkstoff.get(stick, 2), - GT_Proxy.tBits, - new Object[] { "s", "X", 'X', werkstoff.get(stickLong) }); + werkstoff.get(stick, 2), + GT_Proxy.tBits, + new Object[] { "s", "X", 'X', werkstoff.get(stickLong) }); GT_ModHandler.addCraftingRecipe( - werkstoff.get(stick), - GT_Proxy.tBits, - new Object[] { "f ", " X", 'X', werkstoff.get(ingot) }); + werkstoff.get(stick), + GT_Proxy.tBits, + new Object[] { "f ", " X", 'X', werkstoff.get(ingot) }); GT_ModHandler.addCraftingRecipe( - werkstoff.get(plate), - GT_Proxy.tBits, - new Object[] { "h", "X", "X", 'X', werkstoff.get(ingot) }); + werkstoff.get(plate), + GT_Proxy.tBits, + new Object[] { "h", "X", "X", 'X', werkstoff.get(ingot) }); GT_ModHandler.addCraftingRecipe( - werkstoff.get(foil, 2), - GT_Proxy.tBits, - new Object[] { "hX", 'X', werkstoff.get(plate) }); + werkstoff.get(foil, 2), + GT_Proxy.tBits, + new Object[] { "hX", 'X', werkstoff.get(plate) }); benderRecipes.add( - new GT_Recipe( - true, - new ItemStack[] { werkstoff.get(ingot), GT_Utility.getIntegratedCircuit(1) }, - new ItemStack[] { werkstoff.get(plate) }, - null, - null, - null, - null, - (int) Math.max(werkstoff.getStats().getMass(), 1L), - 24, - 0)); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot, 3)).itemOutputs(werkstoff.get(plate, 2)) - .duration((int) Math.max(werkstoff.getStats().getMass(), 1L)).eut(16).addTo(hammerRecipes); + new GT_Recipe( + true, + new ItemStack[] { werkstoff.get(ingot), GT_Utility.getIntegratedCircuit(1) }, + new ItemStack[] { werkstoff.get(plate) }, + null, + null, + null, + null, + (int) Math.max( + werkstoff.getStats() + .getMass(), + 1L), + 24, + 0)); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot, 3)) + .itemOutputs(werkstoff.get(plate, 2)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass(), + 1L)) + .eut(16) + .addTo(hammerRecipes); GregTech_API.registerCover( - werkstoff.get(plate), - TextureFactory.of(werkstoff.getTexSet().mTextures[71], werkstoff.getRGBA(), false), - null); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot)) - .itemOutputs(werkstoff.get(stick), werkstoff.get(dustSmall, 2)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 5L, 1L)).eut(16).addTo(latheRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(plate), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(werkstoff.get(foil, 4)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 1L, 1L)).eut(24).addTo(benderRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot), GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(werkstoff.get(foil, 4)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 2L, 1L)).eut(24).addTo(benderRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(stick, 2)).itemOutputs(werkstoff.get(stickLong)) - .duration((int) Math.max(werkstoff.getStats().getMass(), 1L)).eut(16).addTo(hammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot), ItemList.Shape_Extruder_Plate.get(0)) - .itemOutputs(werkstoff.get(plate)).duration((int) Math.max(werkstoff.getStats().getMass() * 2L, 1L)) - .eut(45).addTo(extruderRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot), ItemList.Shape_Extruder_Rod.get(0)) - .itemOutputs(werkstoff.get(stick, 2)) - .duration((int) Math.max(werkstoff.getStats().getMass() * 2L, 1L)).eut(45).addTo(extruderRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot)).itemOutputs(werkstoff.get(dust)) - .duration(2 * TICKS).eut(8).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(plate)).itemOutputs(werkstoff.get(dust)) - .duration(2 * TICKS).eut(8).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(stickLong)).itemOutputs(werkstoff.get(dust)) - .duration(2 * TICKS).eut(8).addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(stick)).itemOutputs(werkstoff.get(dustSmall, 2)) - .duration(2 * TICKS).eut(8).addTo(maceratorRecipes); + werkstoff.get(plate), + TextureFactory.of(werkstoff.getTexSet().mTextures[71], werkstoff.getRGBA(), false), + null); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot)) + .itemOutputs(werkstoff.get(stick), werkstoff.get(dustSmall, 2)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 5L, + 1L)) + .eut(16) + .addTo(latheRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(plate), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(werkstoff.get(foil, 4)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 1L, + 1L)) + .eut(24) + .addTo(benderRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot), GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(werkstoff.get(foil, 4)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 2L, + 1L)) + .eut(24) + .addTo(benderRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(stick, 2)) + .itemOutputs(werkstoff.get(stickLong)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass(), + 1L)) + .eut(16) + .addTo(hammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot), ItemList.Shape_Extruder_Plate.get(0)) + .itemOutputs(werkstoff.get(plate)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 2L, + 1L)) + .eut(45) + .addTo(extruderRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot), ItemList.Shape_Extruder_Rod.get(0)) + .itemOutputs(werkstoff.get(stick, 2)) + .duration( + (int) Math.max( + werkstoff.getStats() + .getMass() * 2L, + 1L)) + .eut(45) + .addTo(extruderRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot)) + .itemOutputs(werkstoff.get(dust)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(plate)) + .itemOutputs(werkstoff.get(dust)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(stickLong)) + .itemOutputs(werkstoff.get(dust)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(stick)) + .itemOutputs(werkstoff.get(dustSmall, 2)) + .duration(2 * TICKS) + .eut(8) + .addTo(maceratorRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java index aa1d3531ec..499477a846 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java @@ -63,527 +63,540 @@ public class ToolLoader implements IWerkstoffRunnable { if (werkstoff.getBridgeMaterial().mDurability == 0) return; if (werkstoff.hasItemType(gem)) { - if (!werkstoff.getGenerationFeatures().isExtension()) GT_ModHandler.addCraftingRecipe( + if (!werkstoff.getGenerationFeatures() + .isExtension()) + GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HARDHAMMER, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial().mHandleMaterial, - null), + GT_MetaGenerated_Tool_01.HARDHAMMER, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial().mHandleMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "XX ", "XXS", "XX ", 'X', gem.get(werkstoff.getBridgeMaterial()), 'S', - stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); + stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(toolHeadSaw, werkstoff.getBridgeMaterial(), 1L), - GT_Proxy.tBits, - new Object[] { "GGf", 'G', gem.get(werkstoff.getBridgeMaterial()) }); + GT_OreDictUnificator.get(toolHeadSaw, werkstoff.getBridgeMaterial(), 1L), + GT_Proxy.tBits, + new Object[] { "GGf", 'G', gem.get(werkstoff.getBridgeMaterial()) }); } if (!werkstoff.hasItemType(plate)) return; // Disable recipe gen with handle Material for GT Materials - if (!werkstoff.getGenerationFeatures().isExtension()) { + if (!werkstoff.getGenerationFeatures() + .isExtension()) { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial().mHandleMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { " fS", " Sh", "W ", 'S', stick.get(werkstoff.getBridgeMaterial()), 'W', - stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial().mHandleMaterial, + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { " fS", " Sh", "W ", 'S', stick.get(werkstoff.getBridgeMaterial()), 'W', + stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(toolHeadWrench, werkstoff.getBridgeMaterial(), 1L), - GT_Proxy.tBits, - new Object[] { "hXW", "XRX", "WXd", 'X', plate.get(werkstoff.getBridgeMaterial()), 'S', - plate.get(werkstoff.getBridgeMaterial().mHandleMaterial), 'R', - ring.get(werkstoff.getBridgeMaterial().mHandleMaterial), 'W', - screw.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); + GT_OreDictUnificator.get(toolHeadWrench, werkstoff.getBridgeMaterial(), 1L), + GT_Proxy.tBits, + new Object[] { "hXW", "XRX", "WXd", 'X', plate.get(werkstoff.getBridgeMaterial()), 'S', + plate.get(werkstoff.getBridgeMaterial().mHandleMaterial), 'R', + ring.get(werkstoff.getBridgeMaterial().mHandleMaterial), 'W', + screw.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HARDHAMMER, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial().mHandleMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { toolHeadHammer.get(werkstoff.getBridgeMaterial()), - stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.HARDHAMMER, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial().mHandleMaterial, + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { toolHeadHammer.get(werkstoff.getBridgeMaterial()), + stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial().mHandleMaterial, - null), - GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "P", "P", "S", 'P', plate.get(werkstoff.getBridgeMaterial()), 'S', - stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.FILE, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial().mHandleMaterial, + null), + GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "P", "P", "S", 'P', plate.get(werkstoff.getBridgeMaterial()), 'S', + stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SAW, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial().mHandleMaterial, - null), - new Object[] { toolHeadSaw.get(werkstoff.getBridgeMaterial()), - stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SAW, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial().mHandleMaterial, + null), + new Object[] { toolHeadSaw.get(werkstoff.getBridgeMaterial()), + stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Rubber, - new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "LBf", "Sd ", "P ", 'B', bolt.get(werkstoff.getBridgeMaterial()), 'P', - plate.get(Materials.AnyRubber), 'S', - stick.get(werkstoff.getBridgeMaterial().mHandleMaterial), 'L', - ItemList.Battery_RE_LV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Rubber, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "LBf", "Sd ", "P ", 'B', bolt.get(werkstoff.getBridgeMaterial()), 'P', + plate.get(Materials.AnyRubber), 'S', stick.get(werkstoff.getBridgeMaterial().mHandleMaterial), 'L', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - SOLDERING_IRON_MV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Rubber, - new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "LBf", "Sd ", "P ", 'B', bolt.get(werkstoff.getBridgeMaterial()), 'P', - plate.get(Materials.AnyRubber), 'S', - stick.get(werkstoff.getBridgeMaterial().mHandleMaterial), 'L', - ItemList.Battery_RE_MV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + SOLDERING_IRON_MV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Rubber, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "LBf", "Sd ", "P ", 'B', bolt.get(werkstoff.getBridgeMaterial()), 'P', + plate.get(Materials.AnyRubber), 'S', stick.get(werkstoff.getBridgeMaterial().mHandleMaterial), 'L', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - SOLDERING_IRON_HV, - 1, - werkstoff.getBridgeMaterial(), - Materials.StyreneButadieneRubber, - new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "LBf", "Sd ", "P ", 'B', bolt.get(werkstoff.getBridgeMaterial()), 'P', - plate.get(Materials.StyreneButadieneRubber), 'S', - stick.get(werkstoff.getBridgeMaterial().mHandleMaterial), 'L', - ItemList.Battery_RE_HV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + SOLDERING_IRON_HV, + 1, + werkstoff.getBridgeMaterial(), + Materials.StyreneButadieneRubber, + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "LBf", "Sd ", "P ", 'B', bolt.get(werkstoff.getBridgeMaterial()), 'P', + plate.get(Materials.StyreneButadieneRubber), 'S', + stick.get(werkstoff.getBridgeMaterial().mHandleMaterial), 'L', + ItemList.Battery_RE_HV_Lithium.get(1L) }); if (!werkstoff.hasItemType(gem)) { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HARDHAMMER, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial().mHandleMaterial, - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "XX ", "XXS", "XX ", 'X', ingot.get(werkstoff.getBridgeMaterial()), 'S', - stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.HARDHAMMER, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial().mHandleMaterial, + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "XX ", "XXS", "XX ", 'X', ingot.get(werkstoff.getBridgeMaterial()), 'S', + stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); } } GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLUNGER, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial(), - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "xRR", " SR", "S f", 'S', stick.get(werkstoff.getBridgeMaterial()), 'R', - plate.get(Materials.AnyRubber) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.PLUNGER, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial(), + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "xRR", " SR", "S f", 'S', stick.get(werkstoff.getBridgeMaterial()), 'R', + plate.get(Materials.AnyRubber) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial(), - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "IhI", "III", " I ", 'I', ingot.get(werkstoff.getBridgeMaterial()) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial(), + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "IhI", "III", " I ", 'I', ingot.get(werkstoff.getBridgeMaterial()) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CROWBAR, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial(), - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "hDS", "DSD", "SDf", 'S', stick.get(werkstoff.getBridgeMaterial()), 'D', Dyes.dyeBlue }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CROWBAR, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial(), + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "hDS", "DSD", "SDf", 'S', stick.get(werkstoff.getBridgeMaterial()), 'D', Dyes.dyeBlue }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WIRECUTTER, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial(), - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PfP", "hPd", "STS", 'S', stick.get(werkstoff.getBridgeMaterial()), 'P', - plate.get(werkstoff.getBridgeMaterial()), 'T', screw.get(werkstoff.getBridgeMaterial()) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WIRECUTTER, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial(), + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PfP", "hPd", "STS", 'S', stick.get(werkstoff.getBridgeMaterial()), 'P', + plate.get(werkstoff.getBridgeMaterial()), 'T', screw.get(werkstoff.getBridgeMaterial()) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCOOP, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial(), - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SWS", "SSS", "xSh", 'S', stick.get(werkstoff.getBridgeMaterial()), 'W', - new ItemStack(Blocks.wool, 1, 32767) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCOOP, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial(), + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SWS", "SSS", "xSh", 'S', stick.get(werkstoff.getBridgeMaterial()), 'W', + new ItemStack(Blocks.wool, 1, 32767) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BRANCHCUTTER, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial(), - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PfP", "PdP", "STS", 'S', stick.get(werkstoff.getBridgeMaterial()), 'P', - plate.get(werkstoff.getBridgeMaterial()), 'T', screw.get(werkstoff.getBridgeMaterial()) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BRANCHCUTTER, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial(), + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PfP", "PdP", "STS", 'S', stick.get(werkstoff.getBridgeMaterial()), 'P', + plate.get(werkstoff.getBridgeMaterial()), 'T', screw.get(werkstoff.getBridgeMaterial()) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.KNIFE, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial(), - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "fPh", " S ", 'S', stick.get(werkstoff.getBridgeMaterial()), 'P', - plate.get(werkstoff.getBridgeMaterial()) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.KNIFE, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial(), + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "fPh", " S ", 'S', stick.get(werkstoff.getBridgeMaterial()), 'P', + plate.get(werkstoff.getBridgeMaterial()) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, - 1, - werkstoff.getBridgeMaterial(), - werkstoff.getBridgeMaterial(), - null), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PPf", "PP ", "Sh ", 'S', stick.get(werkstoff.getBridgeMaterial()), 'P', - plate.get(werkstoff.getBridgeMaterial()) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, + 1, + werkstoff.getBridgeMaterial(), + werkstoff.getBridgeMaterial(), + null), + GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PPf", "PP ", "Sh ", 'S', stick.get(werkstoff.getBridgeMaterial()), 'P', + plate.get(werkstoff.getBridgeMaterial()) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Steel, - new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', - plate.get(Materials.Steel), 'G', gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', plate.get(Materials.Steel), + 'G', gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Steel, - new long[] { 75000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', - plate.get(Materials.Steel), 'G', gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', plate.get(Materials.Steel), + 'G', gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Steel, - new long[] { 50000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', - plate.get(Materials.Steel), 'G', gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', plate.get(Materials.Steel), + 'G', gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Aluminium, - new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', - plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', + plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Aluminium, - new long[] { 300000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', - plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', + plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Aluminium, - new long[] { 200000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', - plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Aluminium), 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', + plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, - 1, - werkstoff.getBridgeMaterial(), - Materials.StainlessSteel, - new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', - plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + werkstoff.getBridgeMaterial(), + Materials.StainlessSteel, + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', + plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, - 1, - werkstoff.getBridgeMaterial(), - Materials.StainlessSteel, - new long[] { 1200000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', - plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + werkstoff.getBridgeMaterial(), + Materials.StainlessSteel, + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', + plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, - 1, - werkstoff.getBridgeMaterial(), - Materials.StainlessSteel, - new long[] { 800000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', - plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + werkstoff.getBridgeMaterial(), + Materials.StainlessSteel, + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SXd", "GMG", "PBP", 'X', toolHeadWrench.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', + plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Steel, - new long[] { 100000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', - plate.get(Materials.Steel), 'G', gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', plate.get(Materials.Steel), + 'G', gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Steel, - new long[] { 75000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', - plate.get(Materials.Steel), 'G', gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', plate.get(Materials.Steel), + 'G', gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Steel, - new long[] { 50000L, 32L, 1L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', - plate.get(Materials.Steel), 'G', gearGtSmall.get(Materials.Steel), 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', screw.get(Materials.Steel), 'P', plate.get(Materials.Steel), + 'G', gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(toolHeadHammer, werkstoff.getBridgeMaterial(), 1L), - GT_Proxy.tBits, - new Object[] { "II ", "IIh", "II ", 'P', plate.get(werkstoff.getBridgeMaterial()), 'I', - ingot.get(werkstoff.getBridgeMaterial()) }); + GT_OreDictUnificator.get(toolHeadHammer, werkstoff.getBridgeMaterial(), 1L), + GT_Proxy.tBits, + new Object[] { "II ", "IIh", "II ", 'P', plate.get(werkstoff.getBridgeMaterial()), 'I', + ingot.get(werkstoff.getBridgeMaterial()) }); if (werkstoff.hasItemType(plateDouble) && werkstoff.hasItemType(cellMolten)) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(turbineBlade, werkstoff.getBridgeMaterial(), 1L), - GT_Proxy.tBits, - new Object[] { "fPd", "SPS", " P ", 'P', plateDouble.get(werkstoff.getBridgeMaterial()), 'S', - screw.get(werkstoff.getBridgeMaterial()) }); + GT_OreDictUnificator.get(turbineBlade, werkstoff.getBridgeMaterial(), 1L), + GT_Proxy.tBits, + new Object[] { "fPd", "SPS", " P ", 'P', plateDouble.get(werkstoff.getBridgeMaterial()), 'S', + screw.get(werkstoff.getBridgeMaterial()) }); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(ingot, 6), ItemList.Shape_Extruder_Turbine_Blade.get(0)) - .itemOutputs(werkstoff.get(turbineBlade, 1)).duration((int) werkstoff.getStats().getMass() / 2 * 20) - .eut(TierEU.RECIPE_MV).addTo(extruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot, 6), ItemList.Shape_Extruder_Turbine_Blade.get(0)) + .itemOutputs(werkstoff.get(turbineBlade, 1)) + .duration( + (int) werkstoff.getStats() + .getMass() / 2 * 20) + .eut(TierEU.RECIPE_MV) + .addTo(extruderRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Turbine_Blade.get(0)) - .itemOutputs(werkstoff.get(turbineBlade, 1)).fluidInputs(werkstoff.getMolten(864)) - .duration((int) werkstoff.getStats().getMass() * 20).eut(TierEU.RECIPE_MV) - .addTo(fluidSolidifierRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Turbine_Blade.get(0)) + .itemOutputs(werkstoff.get(turbineBlade, 1)) + .fluidInputs(werkstoff.getMolten(864)) + .duration( + (int) werkstoff.getStats() + .getMass() * 20) + .eut(TierEU.RECIPE_MV) + .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder().itemInputs(werkstoff.get(plateDouble, 3), werkstoff.get(screw, 2)) - .itemOutputs(werkstoff.get(turbineBlade, 1)) - .duration((werkstoff.getStats().getMass() / 4) * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(formingPressRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(werkstoff.get(plateDouble, 3), werkstoff.get(screw, 2)) + .itemOutputs(werkstoff.get(turbineBlade, 1)) + .duration( + (werkstoff.getStats() + .getMass() / 4) * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(formingPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - werkstoff.get(turbineBlade, 4), - GT_OreDictUnificator.get(stickLong, Materials.Magnalium, 1)) - .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.TURBINE_SMALL, - 1, - werkstoff.getBridgeMaterial(), - Materials.Magnalium, - null)) - .duration(8 * SECONDS).eut(100).addTo(assemblerRecipes); + .itemInputs(werkstoff.get(turbineBlade, 4), GT_OreDictUnificator.get(stickLong, Materials.Magnalium, 1)) + .itemOutputs( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.TURBINE_SMALL, + 1, + werkstoff.getBridgeMaterial(), + Materials.Magnalium, + null)) + .duration(8 * SECONDS) + .eut(100) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - werkstoff.get(turbineBlade, 8), - GT_OreDictUnificator.get(stickLong, Materials.Titanium, 1)) - .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.TURBINE, - 1, - werkstoff.getBridgeMaterial(), - Materials.Titanium, - null)) - .duration(16 * SECONDS).eut(400).addTo(assemblerRecipes); + .itemInputs(werkstoff.get(turbineBlade, 8), GT_OreDictUnificator.get(stickLong, Materials.Titanium, 1)) + .itemOutputs( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.TURBINE, + 1, + werkstoff.getBridgeMaterial(), + Materials.Titanium, + null)) + .duration(16 * SECONDS) + .eut(400) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - werkstoff.get(turbineBlade, 12), - GT_OreDictUnificator.get(stickLong, Materials.TungstenSteel, 1)) - .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.TURBINE_LARGE, - 1, - werkstoff.getBridgeMaterial(), - Materials.TungstenSteel, - null)) - .duration(32 * SECONDS).eut(1600).addTo(assemblerRecipes); + .itemInputs( + werkstoff.get(turbineBlade, 12), + GT_OreDictUnificator.get(stickLong, Materials.TungstenSteel, 1)) + .itemOutputs( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.TURBINE_LARGE, + 1, + werkstoff.getBridgeMaterial(), + Materials.TungstenSteel, + null)) + .duration(32 * SECONDS) + .eut(1600) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - werkstoff.get(turbineBlade, 16), - GT_OreDictUnificator.get(stickLong, Materials.Americium, 1)) - .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.TURBINE_HUGE, - 1, - werkstoff.getBridgeMaterial(), - Materials.Americium, - null)) - .duration(1 * MINUTES + 4 * SECONDS).eut(6400).addTo(assemblerRecipes); + .itemInputs( + werkstoff.get(turbineBlade, 16), + GT_OreDictUnificator.get(stickLong, Materials.Americium, 1)) + .itemOutputs( + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.TURBINE_HUGE, + 1, + werkstoff.getBridgeMaterial(), + Materials.Americium, + null)) + .duration(1 * MINUTES + 4 * SECONDS) + .eut(6400) + .addTo(assemblerRecipes); } if (!werkstoff.hasItemType(gem)) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(toolHeadSaw, werkstoff.getBridgeMaterial(), 1L), - GT_Proxy.tBits, - new Object[] { "PP ", "fh ", 'P', plate.get(werkstoff.getBridgeMaterial()), 'I', - ingot.get(werkstoff.getBridgeMaterial()) }); + GT_OreDictUnificator.get(toolHeadSaw, werkstoff.getBridgeMaterial(), 1L), + GT_Proxy.tBits, + new Object[] { "PP ", "fh ", 'P', plate.get(werkstoff.getBridgeMaterial()), 'I', + ingot.get(werkstoff.getBridgeMaterial()) }); } GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - SCREWDRIVER_MV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Aluminium, - new long[] { 400000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', - plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Titanium), 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + SCREWDRIVER_MV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', + plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Titanium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - SCREWDRIVER_MV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Aluminium, - new long[] { 300000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', - plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Titanium), 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + SCREWDRIVER_MV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', + plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Titanium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - SCREWDRIVER_MV, - 1, - werkstoff.getBridgeMaterial(), - Materials.Aluminium, - new long[] { 200000L, 128L, 2L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', - plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Titanium), 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + SCREWDRIVER_MV, + 1, + werkstoff.getBridgeMaterial(), + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', screw.get(Materials.Aluminium), 'P', + plate.get(Materials.Aluminium), 'G', gearGtSmall.get(Materials.Titanium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - SCREWDRIVER_HV, - 1, - werkstoff.getBridgeMaterial(), - Materials.StainlessSteel, - new long[] { 1600000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', - plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + SCREWDRIVER_HV, + 1, + werkstoff.getBridgeMaterial(), + Materials.StainlessSteel, + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', + plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - SCREWDRIVER_HV, - 1, - werkstoff.getBridgeMaterial(), - Materials.StainlessSteel, - new long[] { 1200000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', - plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + SCREWDRIVER_HV, + 1, + werkstoff.getBridgeMaterial(), + Materials.StainlessSteel, + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', + plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - SCREWDRIVER_HV, - 1, - werkstoff.getBridgeMaterial(), - Materials.StainlessSteel, - new long[] { 800000L, 512L, 3L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', - ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', - plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) }); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + SCREWDRIVER_HV, + 1, + werkstoff.getBridgeMaterial(), + Materials.StainlessSteel, + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "PdX", "MGS", "GBP", 'X', stickLong.get(werkstoff.getBridgeMaterial()), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', screw.get(Materials.StainlessSteel), 'P', + plate.get(Materials.StainlessSteel), 'G', gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java index e7019d75e2..5dafebb48e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java @@ -42,73 +42,80 @@ public class BridgeMaterialsLoader implements IWerkstoffRunnable { // aDensityMultiplier, int aDensityDivider, Dyes aColor, String aConfigSection, boolean aCustomOre, String // aCustomID Materials werkstoffBridgeMaterial = werkstoff.getBridgeMaterial() != null ? werkstoff.getBridgeMaterial() - : Materials.get(werkstoff.getVarName()) != Materials._NULL ? Materials.get(werkstoff.getVarName()) - : new Materials( - -1, - werkstoff.getTexSet(), - werkstoff.getToolSpeed(), - werkstoff.getDurability(), - werkstoff.getToolQuality(), - 0, - werkstoff.getRGBA()[0], - werkstoff.getRGBA()[1], - werkstoff.getRGBA()[2], - werkstoff.getRGBA()[3], - werkstoff.getVarName(), - werkstoff.getDefaultName(), - 0, - 0, - werkstoff.getStats().getMeltingPoint(), - werkstoff.getStats().getMeltingPoint(), - werkstoff.getStats().isBlastFurnace(), - false, - 0, - 1, - 1, - null); + : Materials.get(werkstoff.getVarName()) != Materials._NULL ? Materials.get(werkstoff.getVarName()) + : new Materials( + -1, + werkstoff.getTexSet(), + werkstoff.getToolSpeed(), + werkstoff.getDurability(), + werkstoff.getToolQuality(), + 0, + werkstoff.getRGBA()[0], + werkstoff.getRGBA()[1], + werkstoff.getRGBA()[2], + werkstoff.getRGBA()[3], + werkstoff.getVarName(), + werkstoff.getDefaultName(), + 0, + 0, + werkstoff.getStats() + .getMeltingPoint(), + werkstoff.getStats() + .getMeltingPoint(), + werkstoff.getStats() + .isBlastFurnace(), + false, + 0, + 1, + 1, + null); for (OrePrefixes prefixes : values()) { if (prefixes != cell || !Werkstoff.Types.ELEMENT.equals(werkstoff.getType())) { if (prefixes == dust && Werkstoff.Types.ELEMENT.equals(werkstoff.getType()) - && Werkstoff.Types.ELEMENT.equals(werkstoff.getType())) { + && Werkstoff.Types.ELEMENT.equals(werkstoff.getType())) { boolean ElementSet = false; for (Element e : Element.values()) { - if (e.toString().equals(werkstoff.getToolTip())) { + if (e.toString() + .equals(werkstoff.getToolTip())) { if (!e.mLinkedMaterials.isEmpty()) break; werkstoffBridgeMaterial = werkstoff.getBridgeMaterial() != null - ? werkstoff.getBridgeMaterial() - : Materials.get(werkstoff.getVarName()) != Materials._NULL - ? Materials.get(werkstoff.getVarName()) - : new Materials( - -1, - werkstoff.getTexSet(), - werkstoff.getToolSpeed(), - werkstoff.getDurability(), - werkstoff.getToolQuality(), - 0, - werkstoff.getRGBA()[0], - werkstoff.getRGBA()[1], - werkstoff.getRGBA()[2], - werkstoff.getRGBA()[3], - werkstoff.getVarName(), - werkstoff.getDefaultName(), - 0, - 0, - werkstoff.getStats().getMeltingPoint(), - werkstoff.getStats().getMeltingPoint(), - werkstoff.getStats().isBlastFurnace(), - false, - 0, - 1, - 1, - null); + ? werkstoff.getBridgeMaterial() + : Materials.get(werkstoff.getVarName()) != Materials._NULL + ? Materials.get(werkstoff.getVarName()) + : new Materials( + -1, + werkstoff.getTexSet(), + werkstoff.getToolSpeed(), + werkstoff.getDurability(), + werkstoff.getToolQuality(), + 0, + werkstoff.getRGBA()[0], + werkstoff.getRGBA()[1], + werkstoff.getRGBA()[2], + werkstoff.getRGBA()[3], + werkstoff.getVarName(), + werkstoff.getDefaultName(), + 0, + 0, + werkstoff.getStats() + .getMeltingPoint(), + werkstoff.getStats() + .getMeltingPoint(), + werkstoff.getStats() + .isBlastFurnace(), + false, + 0, + 1, + 1, + null); werkstoffBridgeMaterial.mElement = e; e.mLinkedMaterials = new ArrayList<>(); e.mLinkedMaterials.add(werkstoffBridgeMaterial); if (werkstoff.hasItemType(dust)) { GT_OreDictUnificator - .addAssociation(dust, werkstoffBridgeMaterial, werkstoff.get(dust), false); + .addAssociation(dust, werkstoffBridgeMaterial, werkstoff.get(dust), false); GT_OreDictUnificator - .set(dust, werkstoffBridgeMaterial, werkstoff.get(dust), true, true); + .set(dust, werkstoffBridgeMaterial, werkstoff.get(dust), true, true); } ElementSet = true; break; @@ -122,12 +129,15 @@ public class BridgeMaterialsLoader implements IWerkstoffRunnable { if (werkstoff.hasItemType(cell)) { werkstoffBridgeMaterial.setHasCorrespondingFluid(true); werkstoffBridgeMaterial.setHasCorrespondingGas(true); - werkstoffBridgeMaterial.mFluid = werkstoff.getFluidOrGas(1).getFluid(); - werkstoffBridgeMaterial.mGas = werkstoff.getFluidOrGas(1).getFluid(); + werkstoffBridgeMaterial.mFluid = werkstoff.getFluidOrGas(1) + .getFluid(); + werkstoffBridgeMaterial.mGas = werkstoff.getFluidOrGas(1) + .getFluid(); } if (werkstoff.hasItemType(cellMolten)) { - werkstoffBridgeMaterial.mStandardMoltenFluid = werkstoff.getMolten(1).getFluid(); + werkstoffBridgeMaterial.mStandardMoltenFluid = werkstoff.getMolten(1) + .getFluid(); } werkstoffBridgeMaterial.mName = werkstoff.getVarName(); werkstoffBridgeMaterial.mDefaultLocalName = werkstoff.getDefaultName(); @@ -135,23 +145,26 @@ public class BridgeMaterialsLoader implements IWerkstoffRunnable { if ("null".equals(werkstoffBridgeMaterial.mLocalizedName)) // only reload from lang file if not localized already werkstoffBridgeMaterial.mLocalizedName = GT_LanguageManager.addStringLocalization( - "Material." + werkstoffBridgeMaterial.mName.toLowerCase(), - werkstoffBridgeMaterial.mDefaultLocalName); + "Material." + werkstoffBridgeMaterial.mName.toLowerCase(), + werkstoffBridgeMaterial.mDefaultLocalName); if (Thaumcraft.isModLoaded()) { werkstoffBridgeMaterial.mAspects = werkstoff.getGTWrappedTCAspects(); } werkstoffBridgeMaterial.mMaterialInto = werkstoffBridgeMaterial; werkstoffBridgeMaterial.mHandleMaterial = werkstoff.contains(SubTag.BURNING) ? Materials.Blaze - : werkstoff.contains(SubTag.MAGICAL) ? Materials.Thaumium - : werkstoffBridgeMaterial.mDurability > 5120 ? Materials.TungstenSteel - : werkstoffBridgeMaterial.mDurability > 1280 ? Materials.Steel : Materials.Wood; - if (werkstoff.getStats().isRadioactive()) { + : werkstoff.contains(SubTag.MAGICAL) ? Materials.Thaumium + : werkstoffBridgeMaterial.mDurability > 5120 ? Materials.TungstenSteel + : werkstoffBridgeMaterial.mDurability > 1280 ? Materials.Steel : Materials.Wood; + if (werkstoff.getStats() + .isRadioactive()) { werkstoffBridgeMaterial.setEnchantmentForArmors( - Enchantment_Radioactivity.INSTANCE, - werkstoff.getStats().getEnchantmentlvl()); + Enchantment_Radioactivity.INSTANCE, + werkstoff.getStats() + .getEnchantmentlvl()); werkstoffBridgeMaterial.setEnchantmentForTools( - Enchantment_Radioactivity.INSTANCE, - werkstoff.getStats().getEnchantmentlvl()); + Enchantment_Radioactivity.INSTANCE, + werkstoff.getStats() + .getEnchantmentlvl()); } werkstoff.setBridgeMaterial(werkstoffBridgeMaterial); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/CasingRegistrator.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/CasingRegistrator.java index c91b9cb053..b2287b48b5 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/CasingRegistrator.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/CasingRegistrator.java @@ -27,14 +27,14 @@ public class CasingRegistrator implements IWerkstoffRunnable { @Override public void run(Werkstoff werkstoff) { GT_OreDictUnificator.addAssociation( - OrePrefixes.blockCasing, - werkstoff.getBridgeMaterial(), - new ItemStack(WerkstoffLoader.BWBlockCasings, 1, werkstoff.getmID()), - false); + OrePrefixes.blockCasing, + werkstoff.getBridgeMaterial(), + new ItemStack(WerkstoffLoader.BWBlockCasings, 1, werkstoff.getmID()), + false); GT_OreDictUnificator.addAssociation( - OrePrefixes.blockCasingAdvanced, - werkstoff.getBridgeMaterial(), - new ItemStack(WerkstoffLoader.BWBlockCasingsAdvanced, 1, werkstoff.getmID()), - false); + OrePrefixes.blockCasingAdvanced, + werkstoff.getBridgeMaterial(), + new ItemStack(WerkstoffLoader.BWBlockCasingsAdvanced, 1, werkstoff.getmID()), + false); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/oredict/OreDictHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/oredict/OreDictHandler.java index bd3b30a95a..683b55b333 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/oredict/OreDictHandler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/oredict/OreDictHandler.java @@ -48,20 +48,23 @@ public class OreDictHandler { OreDictHandler.cache.clear(); OreDictHandler.cacheNonBW.clear(); for (String s : used) { - if (!OreDictionary.getOres(s).isEmpty()) { - ItemStack tmpstack = OreDictionary.getOres(s).get(0).copy(); + if (!OreDictionary.getOres(s) + .isEmpty()) { + ItemStack tmpstack = OreDictionary.getOres(s) + .get(0) + .copy(); Pair<Integer, Short> p = new Pair<>( - Item.getIdFromItem(tmpstack.getItem()), - (short) tmpstack.getItemDamage()); + Item.getIdFromItem(tmpstack.getItem()), + (short) tmpstack.getItemDamage()); OreDictHandler.cache.put(s, p); for (ItemStack tmp : OreDictionary.getOres(s)) { Pair<Integer, Short> p2 = new Pair<>( - Item.getIdFromItem(tmp.getItem()), - (short) tmp.getItemDamage()); + Item.getIdFromItem(tmp.getItem()), + (short) tmp.getItemDamage()); GameRegistry.UniqueIdentifier UI = GameRegistry.findUniqueIdentifierFor(tmp.getItem()); if (UI == null) UI = GameRegistry.findUniqueIdentifierFor(Block.getBlockFromItem(tmp.getItem())); if (!MainMod.MOD_ID.equals(UI.modId) && !BartWorksCrossmod.MOD_ID.equals(UI.modId) - && !"BWCore".equals(UI.modId)) { + && !"BWCore".equals(UI.modId)) { OreDictHandler.cacheNonBW.add(p2); } } @@ -74,12 +77,16 @@ public class OreDictHandler { Pair<Integer, Short> p = OreDictHandler.cache.get(prefixes + elementName.replace(" ", "")); return new ItemStack(Item.getItemById(p.getKey()), amount, p.getValue()); } - if (!OreDictionary.getOres(prefixes + elementName.replace(" ", "")).isEmpty()) { - ItemStack tmp = GT_OreDictUnificator - .get(OreDictionary.getOres(prefixes + elementName.replace(" ", "")).get(0).copy()).copy(); + if (!OreDictionary.getOres(prefixes + elementName.replace(" ", "")) + .isEmpty()) { + ItemStack tmp = GT_OreDictUnificator.get( + OreDictionary.getOres(prefixes + elementName.replace(" ", "")) + .get(0) + .copy()) + .copy(); OreDictHandler.cache.put( - prefixes + elementName.replace(" ", ""), - new Pair<>(Item.getIdFromItem(tmp.getItem()), (short) tmp.getItemDamage())); + prefixes + elementName.replace(" ", ""), + new Pair<>(Item.getIdFromItem(tmp.getItem()), (short) tmp.getItemDamage())); tmp.stackSize = amount; return tmp; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_OreLayer.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_OreLayer.java index 0590b522ca..3305741f27 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_OreLayer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_OreLayer.java @@ -61,7 +61,7 @@ public abstract class BW_OreLayer extends GT_Worldgen { public abstract String getDimName(); public BW_OreLayer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, int aSize, - ISubTagContainer top, ISubTagContainer bottom, ISubTagContainer between, ISubTagContainer sprinkled) { + ISubTagContainer top, ISubTagContainer bottom, ISubTagContainer between, ISubTagContainer sprinkled) { super(aName, BW_OreLayer.sList, aDefault); this.mMinY = (short) aMinY; this.mMaxY = (short) aMaxY; @@ -77,13 +77,13 @@ public abstract class BW_OreLayer extends GT_Worldgen { if (sprinkled instanceof Werkstoff) this.bwOres = (byte) (this.bwOres | 0b0001); short aPrimary = top instanceof Materials ? (short) ((Materials) top).mMetaItemSubID - : top instanceof Werkstoff ? ((Werkstoff) top).getmID() : 0; + : top instanceof Werkstoff ? ((Werkstoff) top).getmID() : 0; short aSecondary = bottom instanceof Materials ? (short) ((Materials) bottom).mMetaItemSubID - : bottom instanceof Werkstoff ? ((Werkstoff) bottom).getmID() : 0; + : bottom instanceof Werkstoff ? ((Werkstoff) bottom).getmID() : 0; short aBetween = between instanceof Materials ? (short) ((Materials) between).mMetaItemSubID - : between instanceof Werkstoff ? ((Werkstoff) between).getmID() : 0; + : between instanceof Werkstoff ? ((Werkstoff) between).getmID() : 0; short aSporadic = sprinkled instanceof Materials ? (short) ((Materials) sprinkled).mMetaItemSubID - : sprinkled instanceof Werkstoff ? ((Werkstoff) sprinkled).getmID() : 0; + : sprinkled instanceof Werkstoff ? ((Werkstoff) sprinkled).getmID() : 0; this.mPrimaryMeta = aPrimary; this.mSecondaryMeta = aSecondary; this.mBetweenMeta = aBetween; @@ -97,17 +97,17 @@ public abstract class BW_OreLayer extends GT_Worldgen { public List<ItemStack> getStacks() { ArrayList<ItemStack> ret = new ArrayList<>(); ret.add( - (this.bwOres & 0b1000) != 0 ? new ItemStack(WerkstoffLoader.BWOres, 1, this.mPrimaryMeta) - : new ItemStack(GregTech_API.sBlockOres1, 1, this.mPrimaryMeta)); + (this.bwOres & 0b1000) != 0 ? new ItemStack(WerkstoffLoader.BWOres, 1, this.mPrimaryMeta) + : new ItemStack(GregTech_API.sBlockOres1, 1, this.mPrimaryMeta)); ret.add( - (this.bwOres & 0b0100) != 0 ? new ItemStack(WerkstoffLoader.BWOres, 1, this.mSecondaryMeta) - : new ItemStack(GregTech_API.sBlockOres1, 1, this.mSecondaryMeta)); + (this.bwOres & 0b0100) != 0 ? new ItemStack(WerkstoffLoader.BWOres, 1, this.mSecondaryMeta) + : new ItemStack(GregTech_API.sBlockOres1, 1, this.mSecondaryMeta)); ret.add( - (this.bwOres & 0b0010) != 0 ? new ItemStack(WerkstoffLoader.BWOres, 1, this.mBetweenMeta) - : new ItemStack(GregTech_API.sBlockOres1, 1, this.mBetweenMeta)); + (this.bwOres & 0b0010) != 0 ? new ItemStack(WerkstoffLoader.BWOres, 1, this.mBetweenMeta) + : new ItemStack(GregTech_API.sBlockOres1, 1, this.mBetweenMeta)); ret.add( - (this.bwOres & 0b0001) != 0 ? new ItemStack(WerkstoffLoader.BWOres, 1, this.mSporadicMeta) - : new ItemStack(GregTech_API.sBlockOres1, 1, this.mSporadicMeta)); + (this.bwOres & 0b0001) != 0 ? new ItemStack(WerkstoffLoader.BWOres, 1, this.mSporadicMeta) + : new ItemStack(GregTech_API.sBlockOres1, 1, this.mSporadicMeta)); return ret; } @@ -122,7 +122,7 @@ public abstract class BW_OreLayer extends GT_Worldgen { @Override public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, - int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { + int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { { int tMinY = this.mMinY + aRandom.nextInt(this.mMaxY - this.mMinY - 5); int cX = aChunkX - aRandom.nextInt(this.mSize); @@ -146,7 +146,7 @@ public abstract class BW_OreLayer extends GT_Worldgen { if (this.mBetweenMeta > 0 && this.shouldPlace(aRandom, cX, eX, tX, cZ, eZ, tZ)) { wasPlaced = this - .setOreBlock(aWorld, tX, tMinY + 2 + aRandom.nextInt(2), tZ, this.mBetweenMeta, false); + .setOreBlock(aWorld, tX, tMinY + 2 + aRandom.nextInt(2), tZ, this.mBetweenMeta, false); } if (this.mPrimaryMeta > 0) { @@ -159,7 +159,7 @@ public abstract class BW_OreLayer extends GT_Worldgen { if (this.mSporadicMeta > 0 && this.shouldPlace(aRandom, cX, eX, tX, cZ, eZ, tZ)) { wasPlaced = this - .setOreBlock(aWorld, tX, tMinY - 1 + aRandom.nextInt(7), tZ, this.mSporadicMeta, false); + .setOreBlock(aWorld, tX, tMinY - 1 + aRandom.nextInt(7), tZ, this.mSporadicMeta, false); } } } @@ -174,10 +174,9 @@ public abstract class BW_OreLayer extends GT_Worldgen { private boolean shouldPlace(Random aRandom, int cX, int eX, int tX, int cZ, int eZ, int tZ) { if (aRandom.nextInt( - Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) == 0 - || aRandom.nextInt( - Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) - == 0) + Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) == 0 + || aRandom.nextInt( + Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0) return true; return false; } @@ -188,28 +187,28 @@ public abstract class BW_OreLayer extends GT_Worldgen { if (te instanceof BW_MetaGeneratedOreTE || te instanceof GT_TileEntity_Ores) return true; if (aMetaData == this.mSporadicMeta && (this.bwOres & 0b0001) != 0 - || aMetaData == this.mBetweenMeta && (this.bwOres & 0b0010) != 0 - || aMetaData == this.mPrimaryMeta && (this.bwOres & 0b1000) != 0 - || aMetaData == this.mSecondaryMeta && (this.bwOres & 0b0100) != 0) { + || aMetaData == this.mBetweenMeta && (this.bwOres & 0b0010) != 0 + || aMetaData == this.mPrimaryMeta && (this.bwOres & 0b1000) != 0 + || aMetaData == this.mSecondaryMeta && (this.bwOres & 0b0100) != 0) { return isSmallOre - ? BW_MetaGenerated_SmallOres.setOreBlock( - aWorld, - aX, - aY, - aZ, - aMetaData, - false, - this.getDefaultBlockToReplace(), - this.getDefaultDamageToReplace()) - : BW_MetaGenerated_Ores.setOreBlock( - aWorld, - aX, - aY, - aZ, - aMetaData, - false, - this.getDefaultBlockToReplace(), - this.getDefaultDamageToReplace()); + ? BW_MetaGenerated_SmallOres.setOreBlock( + aWorld, + aX, + aY, + aZ, + aMetaData, + false, + this.getDefaultBlockToReplace(), + this.getDefaultDamageToReplace()) + : BW_MetaGenerated_Ores.setOreBlock( + aWorld, + aX, + aY, + aZ, + aMetaData, + false, + this.getDefaultBlockToReplace(), + this.getDefaultDamageToReplace()); } return this.setGTOreBlockSpace(aWorld, aX, aY, aZ, aMetaData, this.getDefaultBlockToReplace()); @@ -242,9 +241,8 @@ public abstract class BW_OreLayer extends GT_Worldgen { if (!(o instanceof BW_OreLayer that)) return false; if (this.bwOres != that.bwOres || this.mMinY != that.mMinY - || this.mWeight != that.mWeight - || this.mDensity != that.mDensity) - return false; + || this.mWeight != that.mWeight + || this.mDensity != that.mDensity) return false; if (this.mSize != that.mSize) return false; if (this.mMaxY != that.mMaxY) return false; if (this.mPrimaryMeta != that.mPrimaryMeta) return false; @@ -256,11 +254,20 @@ public abstract class BW_OreLayer extends GT_Worldgen { @Override public int hashCode() { return MurmurHash3.murmurhash3_x86_32( - ByteBuffer.allocate(37).put(this.bwOres).putInt(this.mMinY).putInt(this.mWeight).putInt(this.mDensity) - .putInt(this.mSize).putInt(this.mMaxY).putInt(this.mPrimaryMeta).putInt(this.mSecondaryMeta) - .putInt(this.mBetweenMeta).putInt(this.mSporadicMeta).array(), - 0, - 37, - 31); + ByteBuffer.allocate(37) + .put(this.bwOres) + .putInt(this.mMinY) + .putInt(this.mWeight) + .putInt(this.mDensity) + .putInt(this.mSize) + .putInt(this.mMaxY) + .putInt(this.mPrimaryMeta) + .putInt(this.mSecondaryMeta) + .putInt(this.mBetweenMeta) + .putInt(this.mSporadicMeta) + .array(), + 0, + 37, + 31); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WordGenerator.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WordGenerator.java index 983a3b653c..40c2302fb0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WordGenerator.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WordGenerator.java @@ -36,14 +36,14 @@ public class BW_WordGenerator implements IWorldGenerator { } public synchronized void generate(Random aRandom, int aX, int aZ, World aWorld, IChunkProvider aChunkGenerator, - IChunkProvider aChunkProvider) { + IChunkProvider aChunkProvider) { new BW_WordGenerator.WorldGenContainer( - aX * 16, - aZ * 16, - aWorld.provider.dimensionId, - aWorld, - aChunkGenerator, - aChunkProvider).run(); + aX * 16, + aZ * 16, + aWorld.provider.dimensionId, + aWorld, + aChunkGenerator, + aChunkProvider).run(); } public static class WorldGenContainer implements Runnable { @@ -57,7 +57,7 @@ public class BW_WordGenerator implements IWorldGenerator { public int mZ; public WorldGenContainer(int aX, int aZ, int aDimensionType, World aWorld, IChunkProvider aChunkGenerator, - IChunkProvider aChunkProvider) { + IChunkProvider aChunkProvider) { this.mX = aX; this.mZ = aZ; this.mDimensionType = aDimensionType; @@ -94,7 +94,7 @@ public class BW_WordGenerator implements IWorldGenerator { zCenter <<= 4; ChunkCoordIntPair centerChunk = new ChunkCoordIntPair(xCenter, zCenter); if (!BW_WordGenerator.WorldGenContainer.mGenerated.contains(centerChunk) - && this.surroundingChunksLoaded(xCenter, zCenter)) { + && this.surroundingChunksLoaded(xCenter, zCenter)) { BW_WordGenerator.WorldGenContainer.mGenerated.add(centerChunk); if (BW_OreLayer.sWeight > 0 && BW_OreLayer.sList.size() > 0) { boolean temp = true; @@ -111,14 +111,14 @@ public class BW_WordGenerator implements IWorldGenerator { int attempts = 0; do { placed = tWorldGen.executeWorldgen( - this.mWorld, - random, - "", - this.mDimensionType, - xCenter, - zCenter, - this.mChunkGenerator, - this.mChunkProvider); + this.mWorld, + random, + "", + this.mDimensionType, + xCenter, + zCenter, + this.mChunkGenerator, + this.mChunkProvider); ++attempts; } while (!placed && attempts < 25); temp = false; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java index 789d76ca55..6e0f0543e4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java @@ -76,135 +76,128 @@ public class BW_WorldGenRoss128b extends BW_OreLayer { } public BW_WorldGenRoss128b(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, - int aSize, ISubTagContainer top, ISubTagContainer bottom, ISubTagContainer between, - ISubTagContainer sprinkled) { + int aSize, ISubTagContainer top, ISubTagContainer bottom, ISubTagContainer between, + ISubTagContainer sprinkled) { super(aName, aDefault, aMinY, aMaxY, aWeight, aDensity, aSize, top, bottom, between, sprinkled); } public static void initOres() { new BW_WorldGenRoss128b( - "ore.mix.ross128.Thorianit", - true, - 30, - 60, - 17, - 1, - 16, - Thorianit, - Uraninite, - Lepidolite, - Spodumene); + "ore.mix.ross128.Thorianit", + true, + 30, + 60, + 17, + 1, + 16, + Thorianit, + Uraninite, + Lepidolite, + Spodumene); new BW_WorldGenRoss128b("ore.mix.ross128.carbon", true, 5, 25, 5, 4, 12, Graphite, Diamond, Coal, Graphite); new BW_WorldGenRoss128b( - "ore.mix.ross128.bismuth", - true, - 5, - 80, - 30, - 1, - 16, - Bismuthinit, - Stibnite, - Bismuth, - Bismutite); + "ore.mix.ross128.bismuth", + true, + 5, + 80, + 30, + 1, + 16, + Bismuthinit, + Stibnite, + Bismuth, + Bismutite); new BW_WorldGenRoss128b( - "ore.mix.ross128.TurmalinAlkali", - true, - 5, - 80, - 15, - 4, - 48, - Olenit, - FluorBuergerit, - ChromoAluminoPovondrait, - VanadioOxyDravit); + "ore.mix.ross128.TurmalinAlkali", + true, + 5, + 80, + 15, + 4, + 48, + Olenit, + FluorBuergerit, + ChromoAluminoPovondrait, + VanadioOxyDravit); new BW_WorldGenRoss128b( - "ore.mix.ross128.Roquesit", - true, - 30, - 50, - 3, - 1, - 12, - Arsenopyrite, - Ferberite, - Loellingit, - Roquesit); + "ore.mix.ross128.Roquesit", + true, + 30, + 50, + 3, + 1, + 12, + Arsenopyrite, + Ferberite, + Loellingit, + Roquesit); new BW_WorldGenRoss128b( - "ore.mix.ross128.Tungstate", - true, - 5, - 40, - 10, - 4, - 14, - Ferberite, - Huebnerit, - Loellingit, - Scheelite); + "ore.mix.ross128.Tungstate", + true, + 5, + 40, + 10, + 4, + 14, + Ferberite, + Huebnerit, + Loellingit, + Scheelite); new BW_WorldGenRoss128b( - "ore.mix.ross128.CopperSulfits", - true, - 40, - 70, - 80, - 3, - 24, - Djurleit, - Bornite, - Wittichenit, - Tetrahedrite); + "ore.mix.ross128.CopperSulfits", + true, + 40, + 70, + 80, + 3, + 24, + Djurleit, + Bornite, + Wittichenit, + Tetrahedrite); new BW_WorldGenRoss128b( - "ore.mix.ross128.Forsterit", - true, - 20, - 90, - 50, - 2, - 32, - Forsterit, - Fayalit, - DescloiziteCUVO4, - DescloiziteZNVO4); + "ore.mix.ross128.Forsterit", + true, + 20, + 90, + 50, + 2, + 32, + Forsterit, + Fayalit, + DescloiziteCUVO4, + DescloiziteZNVO4); new BW_WorldGenRoss128b( - "ore.mix.ross128.Hedenbergit", - true, - 20, - 90, - 50, - 2, - 32, - Hedenbergit, - Fayalit, - DescloiziteCUVO4, - DescloiziteZNVO4); + "ore.mix.ross128.Hedenbergit", + true, + 20, + 90, + 50, + 2, + 32, + Hedenbergit, + Fayalit, + DescloiziteCUVO4, + DescloiziteZNVO4); new BW_WorldGenRoss128b( - "ore.mix.ross128.RedZircon", - true, - 10, - 80, - 40, - 3, - 24, - Fayalit, - FuchsitAL, - RedZircon, - FuchsitCR); + "ore.mix.ross128.RedZircon", + true, + 10, + 80, + 40, + 3, + 24, + Fayalit, + FuchsitAL, + RedZircon, + FuchsitCR); } public static void initundergroundFluids() { String ross128b = StatCollector.translateToLocal("planet.Ross128b"); uo_dimensionList.SetConfigValues(ross128b, ross128b, "veryheavyoil", "liquid_extra_heavy_oil", 0, 625, 40, 5); - uo_dimensionList.SetConfigValues( - ross128b, - ross128b, - "lava", - FluidRegistry.getFluidName(FluidRegistry.LAVA), - 0, - 820, - 5, - 5); + uo_dimensionList + .SetConfigValues(ross128b, ross128b, "lava", FluidRegistry.getFluidName(FluidRegistry.LAVA), 0, 820, 5, 5); uo_dimensionList.SetConfigValues(ross128b, ross128b, "gas_natural_gas", "gas_natural_gas", 0, 625, 65, 5); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java index ad4bff0aad..7454b0dd93 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java @@ -55,8 +55,8 @@ import gregtech.api.interfaces.ISubTagContainer; public class BW_WorldGenRoss128ba extends BW_OreLayer { public BW_WorldGenRoss128ba(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, - int aSize, ISubTagContainer top, ISubTagContainer bottom, ISubTagContainer between, - ISubTagContainer sprinkled) { + int aSize, ISubTagContainer top, ISubTagContainer bottom, ISubTagContainer between, + ISubTagContainer sprinkled) { super(aName, aDefault, aMinY, aMaxY, aWeight, aDensity, aSize, top, bottom, between, sprinkled); } @@ -81,123 +81,131 @@ public class BW_WorldGenRoss128ba extends BW_OreLayer { public static void init_Ores() { new BW_WorldGenRoss128ba( - "ore.mix.ross128ba.tib", - true, - 30, - 60, - 6, - 1, - 16, - Tiberium, - Tiberium, - NaquadahEnriched, - NaquadahEnriched); + "ore.mix.ross128ba.tib", + true, + 30, + 60, + 6, + 1, + 16, + Tiberium, + Tiberium, + NaquadahEnriched, + NaquadahEnriched); new BW_WorldGenRoss128ba( - "ore.mix.ross128ba.Tungstate", - true, - 5, - 40, - 60, - 4, - 14, - Ferberite, - Huebnerit, - Loellingit, - Scheelite); + "ore.mix.ross128ba.Tungstate", + true, + 5, + 40, + 60, + 4, + 14, + Ferberite, + Huebnerit, + Loellingit, + Scheelite); new BW_WorldGenRoss128ba( - "ore.mix.ross128ba.bart", - true, - 30, - 60, - 1, - 1, - 1, - BArTiMaEuSNeK, - BArTiMaEuSNeK, - BArTiMaEuSNeK, - BArTiMaEuSNeK); + "ore.mix.ross128ba.bart", + true, + 30, + 60, + 1, + 1, + 1, + BArTiMaEuSNeK, + BArTiMaEuSNeK, + BArTiMaEuSNeK, + BArTiMaEuSNeK); new BW_WorldGenRoss128ba( - "ore.mix.ross128ba.TurmalinAlkali", - true, - 5, - 80, - 60, - 4, - 48, - Olenit, - FluorBuergerit, - ChromoAluminoPovondrait, - VanadioOxyDravit); + "ore.mix.ross128ba.TurmalinAlkali", + true, + 5, + 80, + 60, + 4, + 48, + Olenit, + FluorBuergerit, + ChromoAluminoPovondrait, + VanadioOxyDravit); new BW_WorldGenRoss128ba( - "ore.mix.ross128ba.Amethyst", - true, - 5, - 80, - 35, - 2, - 8, - Amethyst, - Olivine, - Prasiolite, - Hedenbergit); + "ore.mix.ross128ba.Amethyst", + true, + 5, + 80, + 35, + 2, + 8, + Amethyst, + Olivine, + Prasiolite, + Hedenbergit); new BW_WorldGenRoss128ba( - "ore.mix.ross128ba.CopperSulfits", - true, - 40, - 70, - 80, - 3, - 24, - Djurleit, - Bornite, - Wittichenit, - Tetrahedrite); + "ore.mix.ross128ba.CopperSulfits", + true, + 40, + 70, + 80, + 3, + 24, + Djurleit, + Bornite, + Wittichenit, + Tetrahedrite); new BW_WorldGenRoss128ba( - "ore.mix.ross128ba.RedZircon", - true, - 10, - 80, - 40, - 3, - 24, - Fayalit, - FuchsitAL, - RedZircon, - FuchsitCR); + "ore.mix.ross128ba.RedZircon", + true, + 10, + 80, + 40, + 3, + 24, + Fayalit, + FuchsitAL, + RedZircon, + FuchsitCR); new BW_WorldGenRoss128ba( - "ore.mix.ross128ba.Fluorspar", - true, - 10, - 80, - 35, - 4, - 8, - Galena, - Sphalerite, - Fluorspar, - Barite); + "ore.mix.ross128ba.Fluorspar", + true, + 10, + 80, + 35, + 4, + 8, + Galena, + Sphalerite, + Fluorspar, + Barite); } public static void init_undergroundFluids() { String ross128b = StatCollector.translateToLocal("moon.Ross128ba"); uo_dimensionList.SetConfigValues( - ross128b, - ross128b, - SaltWater.getFluid(1).getFluid().getName(), - SaltWater.getFluid(1).getFluid().getName(), - 0, - 1250, - 40, - 5); + ross128b, + ross128b, + SaltWater.getFluid(1) + .getFluid() + .getName(), + SaltWater.getFluid(1) + .getFluid() + .getName(), + 0, + 1250, + 40, + 5); uo_dimensionList.SetConfigValues( - ross128b, - ross128b, - Helium_3.getGas(1).getFluid().getName(), - Helium_3.getGas(1).getFluid().getName(), - 0, - 1250, - 60, - 5); + ross128b, + ross128b, + Helium_3.getGas(1) + .getFluid() + .getName(), + Helium_3.getGas(1) + .getFluid() + .getName(), + 0, + 1250, + 60, + 5); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/worldgen/MapGenRuins.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/worldgen/MapGenRuins.java index e94e7b6e71..ef6b88cc5a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/worldgen/MapGenRuins.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/worldgen/MapGenRuins.java @@ -84,7 +84,7 @@ public abstract class MapGenRuins extends WorldGenerator { int[] statBlocks = new int[4]; protected void setRandomBlockWAirChance(World worldObj, int x, int y, int z, Random rand, int airchance, - Pair<Block, Integer>... blocks) { + Pair<Block, Integer>... blocks) { if (rand.nextInt(100) > airchance) this.setRandomBlock(worldObj, x, y, z, rand, blocks); else this.setBlock(worldObj, x, y, z, Blocks.air, 0); } @@ -113,12 +113,12 @@ public abstract class MapGenRuins extends WorldGenerator { if (isEnabled) throw new IllegalStateException("Machine Block Runnable needs to be disabled while creating world!"); this.setBlockAndNotifyAdequately( - worldObj, - x, - y, - z, - GT_WorldgenUtil.GT_TILES, - GregTech_API.METATILEENTITIES[meta].getTileEntityBaseType()); + worldObj, + x, + y, + z, + GT_WorldgenUtil.GT_TILES, + GregTech_API.METATILEENTITIES[meta].getTileEntityBaseType()); TileEntity tile = worldObj.getTileEntity(x, y, z); ((IGregTechTileEntity) tile).setInitialValuesAsNBT(null, (short) meta); return tile; @@ -143,7 +143,7 @@ public abstract class MapGenRuins extends WorldGenerator { } protected void setGTMachine(World worldObj, int x, int y, int z, int meta, String ownerName, - ForgeDirection facing) { + ForgeDirection facing) { try { GT_Runnable_MachineBlockUpdate.setDisabled(); } catch (Throwable ignored) {} @@ -159,7 +159,7 @@ public abstract class MapGenRuins extends WorldGenerator { } private void checkTile(BaseMetaTileEntity BTE, World worldObj, int x, int y, int z, int meta, String ownerName, - ForgeDirection facing, int depth) { + ForgeDirection facing, int depth) { if (depth < 25) { if (BTE.getMetaTileID() != meta || worldObj.getTileEntity(x, y, z) != BTE || BTE.isInvalid()) { this.redoTile(BTE, worldObj, x, y, z, meta, ownerName, facing); @@ -173,7 +173,7 @@ public abstract class MapGenRuins extends WorldGenerator { } private void redoTile(BaseMetaTileEntity BTE, World worldObj, int x, int y, int z, int meta, String ownerName, - ForgeDirection facing) { + ForgeDirection facing) { this.reSetGTTileEntity(BTE, worldObj, x, y, z, meta); BTE = (BaseMetaTileEntity) worldObj.getTileEntity(x, y, z); BTE.setOwnerName(ownerName); @@ -187,7 +187,9 @@ public abstract class MapGenRuins extends WorldGenerator { BaseMetaPipeEntity BTE = (BaseMetaPipeEntity) this.setGTMachineBlock(worldObj, x, y, z, meta); MetaPipeEntity MPE = (MetaPipeEntity) BTE.getMetaTileEntity(); BTE.mConnections |= (byte) (1 << (byte) 4); - BTE.mConnections |= (byte) (1 << ForgeDirection.getOrientation(4).getOpposite().ordinal()); + BTE.mConnections |= (byte) (1 << ForgeDirection.getOrientation(4) + .getOpposite() + .ordinal()); BaseMetaTileEntity BPE = (BaseMetaTileEntity) worldObj.getTileEntity(x, y, z - 1); if (BPE != null) { BTE.mConnections |= (byte) (1 << (byte) 2); @@ -241,13 +243,13 @@ public abstract class MapGenRuins extends WorldGenerator { } else if (dy > 0 && dy < 4) { if (Math.abs(dx) == 5 && Math.abs(dz) == 5) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + dy, - z + dz, - rand, - 5, - this.ToBuildWith[3][0]); + worldObj, + x + dx, + y + dy, + z + dz, + rand, + 5, + this.ToBuildWith[3][0]); } else if (dx == 0 && dz == -5 && (dy == 1 || dy == 2)) { if (dy == 1) { this.setBlock(worldObj, x + dx, y + 1, z + -5, Blocks.iron_door, 1); @@ -257,45 +259,45 @@ public abstract class MapGenRuins extends WorldGenerator { } } else if (Math.abs(dx) == 5 && Math.abs(dz) < 5 || Math.abs(dz) == 5 && Math.abs(dx) < 5) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + dy, - z + dz, - rand, - 25, - this.ToBuildWith[1]); + worldObj, + x + dx, + y + dy, + z + dz, + rand, + 25, + this.ToBuildWith[1]); if (dy == 2 && rand.nextInt(100) < 12) { if (useColor) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + 2, - z + dz, - rand, - 25, - new Pair<>(Blocks.stained_glass_pane, colored)); - } - } else { - this.setRandomBlockWAirChance( worldObj, x + dx, - y + dy, + y + 2, z + dz, rand, 25, - new Pair<>(Blocks.glass_pane, 0)); - } - } - - if (dy == 3 && Math.abs(dx) == 6) { - this.setRandomBlockWAirChance( + new Pair<>(Blocks.stained_glass_pane, colored)); + } + } else { + this.setRandomBlockWAirChance( worldObj, x + dx, - y + 3, + y + dy, z + dz, rand, 25, - this.ToBuildWith[2]); + new Pair<>(Blocks.glass_pane, 0)); + } + } + + if (dy == 3 && Math.abs(dx) == 6) { + this.setRandomBlockWAirChance( + worldObj, + x + dx, + y + 3, + z + dz, + rand, + 25, + this.ToBuildWith[2]); } if (dy == 1) { @@ -307,34 +309,34 @@ public abstract class MapGenRuins extends WorldGenerator { IInventory chest = (IInventory) worldObj.getTileEntity(x + dx, y + dy, z + dz); if (chest != null) { WeightedRandomChestContent.generateChestContents( - secureRandom, - ChestGenHooks.getItems(PYRAMID_JUNGLE_CHEST, rand), - chest, - ChestGenHooks.getCount(PYRAMID_JUNGLE_CHEST, rand)); + secureRandom, + ChestGenHooks.getItems(PYRAMID_JUNGLE_CHEST, rand), + chest, + ChestGenHooks.getCount(PYRAMID_JUNGLE_CHEST, rand)); } } if (dx == 4 && dz == 4) { short meta = GT_WorldgenUtil.getGenerator(secureRandom, tier); this.setGTMachine( + worldObj, + x + dx, + y + dy, + z + dz, + meta, + owner, + tier > 0 ? ForgeDirection.WEST : ForgeDirection.UP); + } else if (dx == 3 && dz == 4) { + if (tier > 0) { + short meta = GT_WorldgenUtil.getBuffer(secureRandom, tier); + this.setGTMachine( worldObj, x + dx, y + dy, z + dz, meta, owner, - tier > 0 ? ForgeDirection.WEST : ForgeDirection.UP); - } else if (dx == 3 && dz == 4) { - if (tier > 0) { - short meta = GT_WorldgenUtil.getBuffer(secureRandom, tier); - this.setGTMachine( - worldObj, - x + dx, - y + dy, - z + dz, - meta, - owner, - ForgeDirection.WEST); + ForgeDirection.WEST); } else { this.setGTCablekWChance(worldObj, x + dx, y + dy, z + dz, rand, 33, cablemeta); } @@ -344,13 +346,13 @@ public abstract class MapGenRuins extends WorldGenerator { if (!lastset || treeinaRow > 2) { short meta = GT_WorldgenUtil.getMachine(secureRandom, tier); this.setGTMachine( - worldObj, - x + dx, - y + dy, - z + dz, - meta, - owner, - ForgeDirection.UP); + worldObj, + x + dx, + y + dy, + z + dz, + meta, + owner, + ForgeDirection.UP); set++; treeinaRow = 0; @@ -365,105 +367,105 @@ public abstract class MapGenRuins extends WorldGenerator { case 4: if (Math.abs(dx) == 5) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + 4, - z + dz, - rand, - 25, - this.ToBuildWith[2]); + worldObj, + x + dx, + y + 4, + z + dz, + rand, + 25, + this.ToBuildWith[2]); break; } if (Math.abs(dz) == 5 && Math.abs(dx) < 5) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + dy, - z + dz, - rand, - 25, - this.ToBuildWith[1]); + worldObj, + x + dx, + y + dy, + z + dz, + rand, + 25, + this.ToBuildWith[1]); } break; case 5: if (Math.abs(dx) == 4) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + 5, - z + dz, - rand, - 25, - this.ToBuildWith[2]); + worldObj, + x + dx, + y + 5, + z + dz, + rand, + 25, + this.ToBuildWith[2]); break; } if (Math.abs(dz) == 5 && Math.abs(dx) < 4) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + dy, - z + dz, - rand, - 25, - this.ToBuildWith[1]); + worldObj, + x + dx, + y + dy, + z + dz, + rand, + 25, + this.ToBuildWith[1]); } break; case 6: if (Math.abs(dx) == 3) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + 6, - z + dz, - rand, - 25, - this.ToBuildWith[2]); + worldObj, + x + dx, + y + 6, + z + dz, + rand, + 25, + this.ToBuildWith[2]); break; } if (Math.abs(dz) == 5 && Math.abs(dx) < 3) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + dy, - z + dz, - rand, - 25, - this.ToBuildWith[1]); + worldObj, + x + dx, + y + dy, + z + dz, + rand, + 25, + this.ToBuildWith[1]); } break; case 7: if (Math.abs(dx) == 2) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + 7, - z + dz, - rand, - 25, - this.ToBuildWith[2]); + worldObj, + x + dx, + y + 7, + z + dz, + rand, + 25, + this.ToBuildWith[2]); break; } if (Math.abs(dz) == 5 && Math.abs(dx) < 2) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + dy, - z + dz, - rand, - 25, - this.ToBuildWith[1]); + worldObj, + x + dx, + y + dy, + z + dz, + rand, + 25, + this.ToBuildWith[1]); } break; case 8: if (Math.abs(dx) == 1 || Math.abs(dx) == 0) { this.setRandomBlockWAirChance( - worldObj, - x + dx, - y + 8, - z + dz, - rand, - 25, - this.ToBuildWith[2]); + worldObj, + x + dx, + y + 8, + z + dz, + rand, + 25, + this.ToBuildWith[2]); } break; default: diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java index 27b16768b9..aec0972a67 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java @@ -46,74 +46,74 @@ public class BWRecipes { public boolean addRadHatch(ItemStack item, int radioLevel, int amount, short[] rgba) { return radioHatchRecipes.addRecipe( - new GT_Recipe( - false, - new ItemStack[] { item }, - null, - null, - new int[] { rgba[0], rgba[1], rgba[2] }, - null, - null, - amount, - radioLevel, - (int) calcDecayTicks(radioLevel))) - != null; + new GT_Recipe( + false, + new ItemStack[] { item }, + null, + null, + new int[] { rgba[0], rgba[1], rgba[2] }, + null, + null, + amount, + radioLevel, + (int) calcDecayTicks(radioLevel))) + != null; } public boolean addBioLabRecipe(ItemStack[] aInputs, ItemStack aOutput, ItemStack aSpecialItems, int[] aChances, - FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) { + FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) { return bioLabRecipes.addRecipe( - new GT_Recipe( - true, - aInputs, - new ItemStack[] { aOutput }, - aSpecialItems, - aChances, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - aSpecialValue)) - != null; + new GT_Recipe( + true, + aInputs, + new ItemStack[] { aOutput }, + aSpecialItems, + aChances, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + aSpecialValue)) + != null; } public boolean addBioLabRecipeIncubation(ItemStack aInput, BioCulture aOutput, int[] aChances, - FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue) { + FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue) { return bioLabRecipes.addRecipe( - new GT_Recipe( - true, - new ItemStack[] { BioItemList.getPetriDish(null), aInput }, - new ItemStack[] { BioItemList.getPetriDish(aOutput) }, - null, - aChances, - aFluidInputs, - new FluidStack[] { GT_Values.NF }, - aDuration, - aEUt, - aSpecialValue)) - != null; + new GT_Recipe( + true, + new ItemStack[] { BioItemList.getPetriDish(null), aInput }, + new ItemStack[] { BioItemList.getPetriDish(aOutput) }, + null, + aChances, + aFluidInputs, + new FluidStack[] { GT_Values.NF }, + aDuration, + aEUt, + aSpecialValue)) + != null; } public boolean addBioLabRecipeIncubation(ItemStack aInput, BioCulture aOutput, int[] aChances, - FluidStack aFluidInputs, int aDuration, int aEUt, int aSpecialValue) { + FluidStack aFluidInputs, int aDuration, int aEUt, int aSpecialValue) { return bioLabRecipes.addRecipe( - new GT_Recipe( - true, - new ItemStack[] { BioItemList.getPetriDish(null), aInput }, - new ItemStack[] { BioItemList.getPetriDish(aOutput) }, - null, - aChances, - new FluidStack[] { aFluidInputs }, - new FluidStack[] { GT_Values.NF }, - aDuration, - aEUt, - aSpecialValue)) - != null; + new GT_Recipe( + true, + new ItemStack[] { BioItemList.getPetriDish(null), aInput }, + new ItemStack[] { BioItemList.getPetriDish(aOutput) }, + null, + aChances, + new FluidStack[] { aFluidInputs }, + new FluidStack[] { GT_Values.NF }, + aDuration, + aEUt, + aSpecialValue)) + != null; } public boolean addBacterialVatRecipe(ItemStack[] aInputs, BioCulture aCulture, FluidStack[] aFluidInputs, - FluidStack[] aFluidOutputs, @Nonnegative int aDuration, @Nonnegative int aEUt, @Nonnegative int aSv, - @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { + FluidStack[] aFluidOutputs, @Nonnegative int aDuration, @Nonnegative int aEUt, @Nonnegative int aSv, + @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { int aSievert = 0; if (aSv >= 83 || aSv == 61 || aSv == 43) aSievert += aSv; aSievert = aSievert << 1; @@ -123,24 +123,24 @@ public class BWRecipes { aSievert = aSievert << 4; aSievert = aSievert | glasTier; return bacterialVatRecipes.addRecipe( - new GT_Recipe( - false, - aInputs, - null, - BioItemList.getPetriDish(aCulture), - new int[] {}, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - aSievert)) - != null; + new GT_Recipe( + false, + aInputs, + null, + BioItemList.getPetriDish(aCulture), + new int[] {}, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + aSievert)) + != null; } @Deprecated public boolean addBacterialVatRecipe(ItemStack[] aInputs, BioCulture aCulture, FluidStack[] aFluidInputs, - FluidStack[] aFluidOutputs, int aDuration, int aEUt, Materials material, @Nonnegative int glasTier, - int aSpecialValue, boolean exactSv) { + FluidStack[] aFluidOutputs, int aDuration, int aEUt, Materials material, @Nonnegative int glasTier, + int aSpecialValue, boolean exactSv) { byte gTier = (byte) glasTier; int aSievert = 0; if (material.getProtons() >= 83 || material.getProtons() == 61 || material.getProtons() == 43) @@ -152,59 +152,59 @@ public class BWRecipes { aSievert = aSievert << 4; aSievert = aSievert | gTier; return bacterialVatRecipes.addRecipe( - new GT_Recipe( - false, - aInputs, - null, - BioItemList.getPetriDish(aCulture), - new int[] {}, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - aSievert)) - != null; + new GT_Recipe( + false, + aInputs, + null, + BioItemList.getPetriDish(aCulture), + new int[] {}, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + aSievert)) + != null; } /** * Adds a Vat recipe without Rad requirements but with Glas requirements */ public boolean addBacterialVatRecipe(ItemStack[] aInputs, BioCulture culture, FluidStack[] aFluidInputs, - FluidStack[] aFluidOutputs, int aDuration, int aEUt, byte glasTier) { + FluidStack[] aFluidOutputs, int aDuration, int aEUt, byte glasTier) { int aSievert = 0; aSievert = aSievert | glasTier; return bacterialVatRecipes.addRecipe( - new GT_Recipe( - false, - aInputs, - null, - BioItemList.getPetriDish(culture), - new int[] {}, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - aSievert)) - != null; + new GT_Recipe( + false, + aInputs, + null, + BioItemList.getPetriDish(culture), + new int[] {}, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + aSievert)) + != null; } /** * Adds a Vat recipe without Rad or Glas requirements */ public boolean addBacterialVatRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, BioCulture culture, - FluidStack[] aFluidOutputs, int aDuration, int aEUt) { + FluidStack[] aFluidOutputs, int aDuration, int aEUt) { return bacterialVatRecipes.addRecipe( - new GT_Recipe( - false, - aInputs, - null, - BioItemList.getPetriDish(culture), - new int[] {}, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - 0)) - != null; + new GT_Recipe( + false, + aInputs, + null, + BioItemList.getPetriDish(culture), + new int[] {}, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUt, + 0)) + != null; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_ColorUtil.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_ColorUtil.java index 5989c1b6d9..2e384c8e0c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_ColorUtil.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_ColorUtil.java @@ -59,11 +59,10 @@ public class BW_ColorUtil { if (rgba[3] - 50 > rgba[0]) return Dyes.dyeMagenta; else if (rgba[0] > 200 && rgba[2] > 140) return Dyes.dyePink; else if (rgba[0] > rgba[1] + rgba[1] / 10 && rgba[0] > rgba[2] + rgba[2] / 10 - && rgba[1] >> 4 == rgba[2] >> 4 - && rgba[1] + 50 > rgba[0]) { - return Dyes.dyeBrown; - } else - return Dyes.dyeRed; + && rgba[1] >> 4 == rgba[2] >> 4 + && rgba[1] + 50 > rgba[0]) { + return Dyes.dyeBrown; + } else return Dyes.dyeRed; case 4: return Dyes._NULL; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java index 75d8d4cc62..b68f3fb437 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Tooltip_Reference.java @@ -31,23 +31,24 @@ public class BW_Tooltip_Reference { public static final String TT = TT_NO_RESET + GRAY; public static final Supplier<String> ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS = () -> StatCollector.translateToLocal( - "tooltip.bw.1.name") + " " + BW; + "tooltip.bw.1.name") + " " + BW; public static final Supplier<String> ADDED_BY_BARTWORKS = () -> StatCollector.translateToLocal("tooltip.bw.0.name") - + " " - + BW; + + " " + + BW; public static final Function<String, String> ADDED_VIA_BARTWORKS = owner -> String - .format(StatCollector.translateToLocal("tooltip.bw.via.name"), owner); + .format(StatCollector.translateToLocal("tooltip.bw.via.name"), owner); public static final String MULTIBLOCK_ADDED_BY_BARTWORKS = BW; public static final Function<String, String> MULTIBLOCK_ADDED_VIA_BARTWORKS = owner -> String - .format(StatCollector.translateToLocal("tooltip.bw.mb_via.name"), owner); + .format(StatCollector.translateToLocal("tooltip.bw.mb_via.name"), owner); public static final String MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS = MULTIBLOCK_ADDED_VIA_BARTWORKS - .apply(GREEN + "bartimaeusnek"); + .apply(GREEN + "bartimaeusnek"); public static final String ADV_STR_CHECK = "Uses an advanced " + TT + " structure check, due to " + BW; public static final String TT_BLUEPRINT = "To see the structure, use a " + TT + " Blueprint on the Controller!"; public static String[] getTranslatedBrandedTooltip(String key) { - String[] dsc = StatCollector.translateToLocal(key).split(";"); + String[] dsc = StatCollector.translateToLocal(key) + .split(";"); String[] fdsc = new String[dsc.length + 1]; System.arraycopy(dsc, 0, fdsc, 0, dsc.length); fdsc[dsc.length] = ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get(); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java index bd9ee551ce..38982f35b3 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java @@ -135,7 +135,8 @@ public class BW_Util { } public static String subscriptNumber(Number b) { - char[] chars = Long.toString(b.longValue()).toCharArray(); + char[] chars = Long.toString(b.longValue()) + .toCharArray(); char[] nu = new char[chars.length]; for (int i = 0; i < chars.length; i++) { nu[i] = switch (chars[i]) { @@ -177,7 +178,8 @@ public class BW_Util { } public static String superscriptNumber(Number b) { - char[] chars = Long.toString(b.longValue()).toCharArray(); + char[] chars = Long.toString(b.longValue()) + .toCharArray(); char[] nu = new char[chars.length]; for (int i = 0; i < chars.length; i++) { nu[i] = switch (chars[i]) { @@ -217,12 +219,13 @@ public class BW_Util { public static int calculateSv(Materials materials) { for (BioVatLogicAdder.MaterialSvPair pair : BioVatLogicAdder.RadioHatch.getMaSv()) { - if (pair.getMaterials().equals(materials)) return pair.getSievert(); + if (pair.getMaterials() + .equals(materials)) return pair.getSievert(); } return (int) (materials.getProtons() == 43L - ? materials.equals(Materials.NaquadahEnriched) ? 140 - : materials.equals(Materials.Naquadria) ? 150 : materials.equals(Materials.Naquadah) ? 130 : 43 - : materials.getProtons()); + ? materials.equals(Materials.NaquadahEnriched) ? 140 + : materials.equals(Materials.Naquadria) ? 150 : materials.equals(Materials.Naquadah) ? 130 : 43 + : materials.getProtons()); } public static ItemStack setStackSize(ItemStack stack, int size) { @@ -232,9 +235,9 @@ public class BW_Util { public static boolean checkStackAndPrefix(ItemStack itemStack) { return itemStack != null && GT_OreDictUnificator.getAssociation(itemStack) != null - && GT_OreDictUnificator.getAssociation(itemStack).mPrefix != null - && GT_OreDictUnificator.getAssociation(itemStack).mMaterial != null - && GT_OreDictUnificator.getAssociation(itemStack).mMaterial.mMaterial != null; + && GT_OreDictUnificator.getAssociation(itemStack).mPrefix != null + && GT_OreDictUnificator.getAssociation(itemStack).mMaterial != null + && GT_OreDictUnificator.getAssociation(itemStack).mMaterial.mMaterial != null; } public static int abstractHashGTRecipe(GT_Recipe recipe) { @@ -275,7 +278,9 @@ public class BW_Util { @SuppressWarnings({ "unchecked" }) public static <T> T[] copyAndRemoveNulls(T[] input, Class<T> clazz) { - List<T> ret = Arrays.stream(input).filter(Objects::nonNull).collect(Collectors.toList()); + List<T> ret = Arrays.stream(input) + .filter(Objects::nonNull) + .collect(Collectors.toList()); if (ret.size() <= 0) return (T[]) Array.newInstance(clazz, 0); @@ -411,27 +416,33 @@ public class BW_Util { if (block.equals(Blocks.glass)) return 3; - for (BioVatLogicAdder.BlockMetaPair B : BioVatLogicAdder.BioVatGlass.getGlassMap().keySet()) - if (B.getBlock().equals(block) && B.getaByte().equals(meta)) - return BioVatLogicAdder.BioVatGlass.getGlassMap().get(B); + for (BioVatLogicAdder.BlockMetaPair B : BioVatLogicAdder.BioVatGlass.getGlassMap() + .keySet()) + if (B.getBlock() + .equals(block) + && B.getaByte() + .equals(meta)) + return BioVatLogicAdder.BioVatGlass.getGlassMap() + .get(B); - if (block.getMaterial().equals(Material.glass)) return 3; + if (block.getMaterial() + .equals(Material.glass)) return 3; return 0; } public static <T> IStructureElement<T> ofGlassTiered(byte mintier, byte maxtier, byte notset, - BiConsumer<T, Byte> setter, Function<T, Byte> getter, int aDots) { + BiConsumer<T, Byte> setter, Function<T, Byte> getter, int aDots) { return new IStructureElement<>() { private final IStructureElement<T> placementDelegate = BorosilicateGlass - .ofBoroGlass(notset, mintier, maxtier, setter, getter); + .ofBoroGlass(notset, mintier, maxtier, setter, getter); @Override public boolean check(T te, World world, int x, int y, int z) { if (world.isAirBlock(x, y, z)) return false; byte glasstier = BW_Util - .calculateGlassTier(world.getBlock(x, y, z), (byte) world.getBlockMetadata(x, y, z)); + .calculateGlassTier(world.getBlock(x, y, z), (byte) world.getBlockMetadata(x, y, z)); // is not a glass ? if (glasstier == 0 || glasstier == notset || glasstier < mintier || glasstier > maxtier) return false; if (getter.apply(te) == notset) setter.accept(te, glasstier); @@ -451,7 +462,7 @@ public class BW_Util { @Override public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, - AutoPlaceEnvironment env) { + AutoPlaceEnvironment env) { return this.placementDelegate.survivalPlaceBlock(t, world, x, y, z, trigger, env); } }; @@ -461,13 +472,13 @@ public class BW_Util { return new IStructureElement<>() { private final IStructureElement<T> placementDelegate = BorosilicateGlass - .ofBoroGlass((byte) 0, mintier, maxtier, (v1, v2) -> {}, v1 -> (byte) 0); + .ofBoroGlass((byte) 0, mintier, maxtier, (v1, v2) -> {}, v1 -> (byte) 0); @Override public boolean check(T te, World world, int x, int y, int z) { if (world.isAirBlock(x, y, z)) return false; byte glasstier = BW_Util - .calculateGlassTier(world.getBlock(x, y, z), (byte) world.getBlockMetadata(x, y, z)); + .calculateGlassTier(world.getBlock(x, y, z), (byte) world.getBlockMetadata(x, y, z)); if (glasstier == 0) return false; // is not a glass ? return glasstier >= mintier && glasstier <= maxtier; } @@ -485,7 +496,7 @@ public class BW_Util { @Override public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, - AutoPlaceEnvironment env) { + AutoPlaceEnvironment env) { return this.placementDelegate.survivalPlaceBlock(t, world, x, y, z, trigger, env); } }; @@ -495,7 +506,7 @@ public class BW_Util { @SuppressWarnings("unchecked") public static List<IRecipe> getGTBufferedRecipeList() - throws SecurityException, IllegalArgumentException, IllegalAccessException { + throws SecurityException, IllegalArgumentException, IllegalAccessException { if (sBufferedRecipeList == null) { sBufferedRecipeList = FieldUtils.getDeclaredField(GT_ModHandler.class, "sBufferRecipeList", true); } @@ -507,31 +518,31 @@ public class BW_Util { public static ShapedOreRecipe createGTCraftingRecipe(ItemStack aResult, long aBitMask, Object[] aRecipe) { return createGTCraftingRecipe( - aResult, - new Enchantment[0], - new int[0], - (aBitMask & GT_ModHandler.RecipeBits.MIRRORED) != 0L, - (aBitMask & GT_ModHandler.RecipeBits.BUFFERED) != 0L, - (aBitMask & GT_ModHandler.RecipeBits.KEEPNBT) != 0L, - (aBitMask & GT_ModHandler.RecipeBits.DISMANTLEABLE) != 0L, - (aBitMask & GT_ModHandler.RecipeBits.NOT_REMOVABLE) == 0L, - (aBitMask & GT_ModHandler.RecipeBits.REVERSIBLE) != 0L, - (aBitMask & GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES) != 0L, - (aBitMask & GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES_IF_SAME_NBT) != 0L, - (aBitMask & GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES) != 0L, - (aBitMask & GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_NATIVE_RECIPES) != 0L, - (aBitMask & GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS) == 0L, - (aBitMask & GT_ModHandler.RecipeBits.ONLY_ADD_IF_THERE_IS_ANOTHER_RECIPE_FOR_IT) != 0L, - (aBitMask & GT_ModHandler.RecipeBits.ONLY_ADD_IF_RESULT_IS_NOT_NULL) != 0L, - aRecipe); + aResult, + new Enchantment[0], + new int[0], + (aBitMask & GT_ModHandler.RecipeBits.MIRRORED) != 0L, + (aBitMask & GT_ModHandler.RecipeBits.BUFFERED) != 0L, + (aBitMask & GT_ModHandler.RecipeBits.KEEPNBT) != 0L, + (aBitMask & GT_ModHandler.RecipeBits.DISMANTLEABLE) != 0L, + (aBitMask & GT_ModHandler.RecipeBits.NOT_REMOVABLE) == 0L, + (aBitMask & GT_ModHandler.RecipeBits.REVERSIBLE) != 0L, + (aBitMask & GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES) != 0L, + (aBitMask & GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES_IF_SAME_NBT) != 0L, + (aBitMask & GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES) != 0L, + (aBitMask & GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_NATIVE_RECIPES) != 0L, + (aBitMask & GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS) == 0L, + (aBitMask & GT_ModHandler.RecipeBits.ONLY_ADD_IF_THERE_IS_ANOTHER_RECIPE_FOR_IT) != 0L, + (aBitMask & GT_ModHandler.RecipeBits.ONLY_ADD_IF_RESULT_IS_NOT_NULL) != 0L, + aRecipe); } public static ShapedOreRecipe createGTCraftingRecipe(ItemStack aResult, Enchantment[] aEnchantmentsAdded, - int[] aEnchantmentLevelsAdded, boolean aMirrored, boolean aBuffered, boolean aKeepNBT, - boolean aDismantleable, boolean aRemovable, boolean aReversible, boolean aRemoveAllOthersWithSameOutput, - boolean aRemoveAllOthersWithSameOutputIfTheyHaveSameNBT, boolean aRemoveAllOtherShapedsWithSameOutput, - boolean aRemoveAllOtherNativeRecipes, boolean aCheckForCollisions, - boolean aOnlyAddIfThereIsAnyRecipeOutputtingThis, boolean aOnlyAddIfResultIsNotNull, Object[] aRecipe) { + int[] aEnchantmentLevelsAdded, boolean aMirrored, boolean aBuffered, boolean aKeepNBT, boolean aDismantleable, + boolean aRemovable, boolean aReversible, boolean aRemoveAllOthersWithSameOutput, + boolean aRemoveAllOthersWithSameOutputIfTheyHaveSameNBT, boolean aRemoveAllOtherShapedsWithSameOutput, + boolean aRemoveAllOtherNativeRecipes, boolean aCheckForCollisions, + boolean aOnlyAddIfThereIsAnyRecipeOutputtingThis, boolean aOnlyAddIfResultIsNotNull, Object[] aRecipe) { aResult = GT_OreDictUnificator.get(true, aResult); if (aOnlyAddIfResultIsNotNull && aResult == null) return null; if (aResult != null && Items.feather.getDamage(aResult) == W) Items.feather.setDamage(aResult, 0); @@ -549,9 +560,9 @@ public class BW_Util { continue; } if (aRecipe[i] != null && !(aRecipe[i] instanceof ItemStack) - && !(aRecipe[i] instanceof ItemData) - && !(aRecipe[i] instanceof String) - && !(aRecipe[i] instanceof Character)) { + && !(aRecipe[i] instanceof ItemData) + && !(aRecipe[i] instanceof String) + && !(aRecipe[i] instanceof Character)) { aRecipe[i] = aRecipe[i].toString(); } } @@ -572,7 +583,8 @@ public class BW_Util { while (s.length() < 3) s.append(" "); if (s.length() > 3) throw new IllegalArgumentException(); - for (char c : s.toString().toCharArray()) { + for (char c : s.toString() + .toCharArray()) { switch (c) { case 'b': tRecipeList.add(c); @@ -649,8 +661,8 @@ public class BW_Util { if (aRecipe[idx] == null || aRecipe[idx + 1] == null) { if (D1) { GT_Log.err.println( - "WARNING: Missing Item for shaped Recipe: " - + (aResult == null ? "null" : aResult.getDisplayName())); + "WARNING: Missing Item for shaped Recipe: " + + (aResult == null ? "null" : aResult.getDisplayName())); for (Object tContent : aRecipe) GT_Log.err.println(tContent); } return null; @@ -707,7 +719,8 @@ public class BW_Util { if (aReversible && aResult != null) { ItemData[] tData = new ItemData[9]; int x = -1; - for (char chr : shape.toString().toCharArray()) { + for (char chr : shape.toString() + .toCharArray()) { x++; tData[x] = tItemDataMap.get(chr); } @@ -718,7 +731,8 @@ public class BW_Util { if (aCheckForCollisions && tRemoveRecipe) { ItemStack[] tRecipe = new ItemStack[9]; int x = -1; - for (char chr : shape.toString().toCharArray()) { + for (char chr : shape.toString() + .toCharArray()) { x++; tRecipe[x] = tItemStackMap.get(chr); if (tRecipe[x] != null && Items.feather.getDamage(tRecipe[x]) == W) @@ -733,20 +747,24 @@ public class BW_Util { if (aResult == null || aResult.stackSize <= 0) return null; if (aRemoveAllOthersWithSameOutput || aRemoveAllOthersWithSameOutputIfTheyHaveSameNBT - || aRemoveAllOtherShapedsWithSameOutput - || aRemoveAllOtherNativeRecipes) + || aRemoveAllOtherShapedsWithSameOutput + || aRemoveAllOtherNativeRecipes) tThereWasARecipe = GT_ModHandler.removeRecipeByOutput( - aResult, - !aRemoveAllOthersWithSameOutputIfTheyHaveSameNBT, - aRemoveAllOtherShapedsWithSameOutput, - aRemoveAllOtherNativeRecipes) || tThereWasARecipe; + aResult, + !aRemoveAllOthersWithSameOutputIfTheyHaveSameNBT, + aRemoveAllOtherShapedsWithSameOutput, + aRemoveAllOtherNativeRecipes) || tThereWasARecipe; if (aOnlyAddIfThereIsAnyRecipeOutputtingThis && !tThereWasARecipe) { - ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance().getRecipeList(); + ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance() + .getRecipeList(); int tList_sS = tList.size(); for (int i = 0; i < tList_sS && !tThereWasARecipe; i++) { IRecipe tRecipe = tList.get(i); - if (GT_ModHandler.sSpecialRecipeClasses.contains(tRecipe.getClass().getName())) continue; + if (GT_ModHandler.sSpecialRecipeClasses.contains( + tRecipe.getClass() + .getName())) + continue; if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(tRecipe.getRecipeOutput()), aResult, true)) { tList.remove(i); i--; @@ -762,13 +780,13 @@ public class BW_Util { GT_Utility.updateItemStack(aResult); return new GT_Shaped_Recipe( - GT_Utility.copy(aResult), - aDismantleable, - aRemovable, - aKeepNBT, - aEnchantmentsAdded, - aEnchantmentLevelsAdded, - aRecipe).setMirrored(aMirrored); + GT_Utility.copy(aResult), + aDismantleable, + aRemovable, + aKeepNBT, + aEnchantmentsAdded, + aEnchantmentLevelsAdded, + aRecipe).setMirrored(aMirrored); } public static void shortSleep(long nanos) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BioCulture.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BioCulture.java index fecaffbecc..c4ff2f721c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BioCulture.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BioCulture.java @@ -30,10 +30,10 @@ public class BioCulture extends BioData implements IColorModulationContainer { public static final ArrayList<BioCulture> BIO_CULTURE_ARRAY_LIST = new ArrayList<>(); public static final BioCulture NULLCULTURE = BioCulture - .createAndRegisterBioCulture(Color.BLUE, "", BioPlasmid.NULLPLASMID, BioDNA.NULLDNA, false); // fallback - // NULL - // culture, - // also Blue =) + .createAndRegisterBioCulture(Color.BLUE, "", BioPlasmid.NULLPLASMID, BioDNA.NULLDNA, false); // fallback + // NULL + // culture, + // also Blue =) public String getLocalisedName() { return GT_LanguageManager.getTranslation(this.getName()); @@ -50,7 +50,7 @@ public class BioCulture extends BioData implements IColorModulationContainer { Fluid mFluid; protected BioCulture(Color color, String name, int ID, BioPlasmid plasmid, BioDNA dDNA, EnumRarity rarity, - boolean bBreedable) { + boolean bBreedable) { super(name, ID, rarity); this.color = color; this.plasmid = plasmid; @@ -66,22 +66,22 @@ public class BioCulture extends BioData implements IColorModulationContainer { } public static BioCulture createAndRegisterBioCulture(Color color, String name, BioPlasmid plasmid, BioDNA dna, - EnumRarity rarity, boolean breedable) { + EnumRarity rarity, boolean breedable) { BioCulture ret = new BioCulture(color, name, BIO_CULTURE_ARRAY_LIST.size(), plasmid, dna, rarity, breedable); BIO_CULTURE_ARRAY_LIST.add(ret); return ret; } public static BioCulture createAndRegisterBioCulture(Color color, String name, BioPlasmid plasmid, BioDNA dna, - boolean breedable) { + boolean breedable) { BioCulture ret = new BioCulture( - color, - name, - BIO_CULTURE_ARRAY_LIST.size(), - plasmid, - dna, - dna.getRarity(), - breedable); + color, + name, + BIO_CULTURE_ARRAY_LIST.size(), + plasmid, + dna, + dna.getRarity(), + breedable); BIO_CULTURE_ARRAY_LIST.add(ret); return ret; } @@ -92,13 +92,16 @@ public class BioCulture extends BioData implements IColorModulationContainer { ret.setString("Name", bioCulture.name); // ret.setInteger("ID", bioCulture.ID); ret.setIntArray( - "Color", - new int[] { bioCulture.color.getRed(), bioCulture.color.getGreen(), bioCulture.color.getBlue() }); + "Color", + new int[] { bioCulture.color.getRed(), bioCulture.color.getGreen(), bioCulture.color.getBlue() }); ret.setTag("Plasmid", BioData.getNBTTagFromBioData(BioData.convertBioPlasmidToBioData(bioCulture.plasmid))); ret.setTag("DNA", BioData.getNBTTagFromBioData(BioData.convertBioDNAToBioData(bioCulture.dDNA))); ret.setBoolean("Breedable", bioCulture.bBreedable); ret.setByte("Rarety", BW_Util.getByteFromRarity(bioCulture.rarity)); - if (bioCulture.bBreedable) ret.setString("Fluid", bioCulture.getFluid().getName()); + if (bioCulture.bBreedable) ret.setString( + "Fluid", + bioCulture.getFluid() + .getName()); return ret; } @@ -107,12 +110,12 @@ public class BioCulture extends BioData implements IColorModulationContainer { BioCulture ret = getBioCulture(tag.getString("Name")); if (ret == null) ret = createAndRegisterBioCulture( - new Color(tag.getIntArray("Color")[0], tag.getIntArray("Color")[1], tag.getIntArray("Color")[2]), - tag.getString("Name"), - BioPlasmid.convertDataToPlasmid(getBioDataFromNBTTag(tag.getCompoundTag("Plasmid"))), - BioDNA.convertDataToDNA(getBioDataFromNBTTag(tag.getCompoundTag("DNA"))), - BW_Util.getRarityFromByte(tag.getByte("Rarety")), - tag.getBoolean("Breedable")); + new Color(tag.getIntArray("Color")[0], tag.getIntArray("Color")[1], tag.getIntArray("Color")[2]), + tag.getString("Name"), + BioPlasmid.convertDataToPlasmid(getBioDataFromNBTTag(tag.getCompoundTag("Plasmid"))), + BioDNA.convertDataToDNA(getBioDataFromNBTTag(tag.getCompoundTag("DNA"))), + BW_Util.getRarityFromByte(tag.getByte("Rarety")), + tag.getBoolean("Breedable")); if (ret.bBreedable) ret.setFluid(FluidRegistry.getFluid(tag.getString("Fluid"))); if (ret.getFluidNotSet()) // should never happen, but better safe than sorry ret.setbBreedable(false); @@ -126,7 +129,8 @@ public class BioCulture extends BioData implements IColorModulationContainer { } public static BioCulture getBioCulture(BioDNA DNA) { - for (BioCulture b : BIO_CULTURE_ARRAY_LIST) if (b.getdDNA().equals(DNA)) return b; + for (BioCulture b : BIO_CULTURE_ARRAY_LIST) if (b.getdDNA() + .equals(DNA)) return b; return null; } @@ -154,7 +158,7 @@ public class BioCulture extends BioData implements IColorModulationContainer { public int getColorRGB() { return BW_ColorUtil - .getColorFromRGBArray(new int[] { this.color.getRed(), this.color.getGreen(), this.color.getBlue() }); + .getColorFromRGBArray(new int[] { this.color.getRed(), this.color.getGreen(), this.color.getBlue() }); } public Color getColor() { @@ -171,13 +175,16 @@ public class BioCulture extends BioData implements IColorModulationContainer { public BioCulture setPlasmid(BioPlasmid plasmid) { return this.checkForExisting( - new BioCulture(this.color, this.name, this.ID, plasmid, this.dDNA, this.rarity, this.bBreedable)); + new BioCulture(this.color, this.name, this.ID, plasmid, this.dDNA, this.rarity, this.bBreedable)); } private BioCulture checkForExisting(BioCulture culture) { if (culture == null) return null; - for (BioCulture bc : BioCulture.BIO_CULTURE_ARRAY_LIST) - if (culture.getdDNA().equals(bc.getdDNA()) && culture.getPlasmid().equals(bc.getPlasmid())) return bc; + for (BioCulture bc : BioCulture.BIO_CULTURE_ARRAY_LIST) if (culture.getdDNA() + .equals(bc.getdDNA()) + && culture.getPlasmid() + .equals(bc.getPlasmid())) + return bc; return culture; } @@ -192,7 +199,7 @@ public class BioCulture extends BioData implements IColorModulationContainer { public BioCulture setdDNA(BioDNA dDNA) { return this.checkForExisting( - new BioCulture(this.color, this.name, this.ID, this.plasmid, dDNA, this.rarity, this.bBreedable)); + new BioCulture(this.color, this.name, this.ID, this.plasmid, dDNA, this.rarity, this.bBreedable)); } public BioCulture setdDNAUnsafe(BioDNA dDNA) { @@ -206,26 +213,41 @@ public class BioCulture extends BioData implements IColorModulationContainer { if (o == null || this.getClass() != o.getClass() || !super.equals(o)) return false; BioCulture culture = (BioCulture) o; return this.isBreedable() == culture.isBreedable() && Objects.equals(this.getColor(), culture.getColor()) - && Objects.equals(this.getPlasmid(), culture.getPlasmid()) - && Objects.equals(this.getdDNA(), culture.getdDNA()) - && Objects.equals(this.mFluid, culture.mFluid); + && Objects.equals(this.getPlasmid(), culture.getPlasmid()) + && Objects.equals(this.getdDNA(), culture.getdDNA()) + && Objects.equals(this.mFluid, culture.mFluid); } @Override public int hashCode() { return MurmurHash3.murmurhash3_x86_32( - ByteBuffer.allocate(17) - .putInt(MurmurHash3.murmurhash3_x86_32(this.getName(), 0, this.getName().length(), 31)) - .putInt(this.getColorRGB()).putInt(this.getPlasmid().ID).putInt(this.getdDNA().ID) - .put((byte) (this.isBreedable() ? 1 : 0)).array(), - 0, - 17, - 31); + ByteBuffer.allocate(17) + .putInt( + MurmurHash3.murmurhash3_x86_32( + this.getName(), + 0, + this.getName() + .length(), + 31)) + .putInt(this.getColorRGB()) + .putInt(this.getPlasmid().ID) + .putInt(this.getdDNA().ID) + .put((byte) (this.isBreedable() ? 1 : 0)) + .array(), + 0, + 17, + 31); } @Override public short[] getRGBA() { - return new short[] { (short) this.getColor().getRed(), (short) this.getColor().getGreen(), - (short) this.getColor().getBlue(), (short) this.getColor().getAlpha() }; + return new short[] { (short) this.getColor() + .getRed(), + (short) this.getColor() + .getGreen(), + (short) this.getColor() + .getBlue(), + (short) this.getColor() + .getAlpha() }; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BioData.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BioData.java index d88ffc3aa3..7a4c87f7d2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BioData.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BioData.java @@ -100,21 +100,29 @@ public class BioData { if (o == null || this.getClass() != o.getClass()) return false; BioData bioData = (BioData) o; return this.getID() == bioData.getID() - || this.getChance() == bioData.getChance() && this.getTier() == bioData.getTier() - && Objects.equals(this.getName(), bioData.getName()) - && this.getRarity() == bioData.getRarity(); + || this.getChance() == bioData.getChance() && this.getTier() == bioData.getTier() + && Objects.equals(this.getName(), bioData.getName()) + && this.getRarity() == bioData.getRarity(); } @Override public int hashCode() { return MurmurHash3.murmurhash3_x86_32( - ByteBuffer.allocate(13) - .putInt(MurmurHash3.murmurhash3_x86_32(this.getName(), 0, this.getName().length(), 31)) - .put(BW_Util.getByteFromRarity(this.getRarity())).putInt(this.getChance()) - .putInt(this.getTier()).array(), - 0, - 13, - 31); + ByteBuffer.allocate(13) + .putInt( + MurmurHash3.murmurhash3_x86_32( + this.getName(), + 0, + this.getName() + .length(), + 31)) + .put(BW_Util.getByteFromRarity(this.getRarity())) + .putInt(this.getChance()) + .putInt(this.getTier()) + .array(), + 0, + 13, + 31); } public int getTier() { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/CachedReflectionUtils.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/CachedReflectionUtils.java index 93220205b7..063a310db8 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/CachedReflectionUtils.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/CachedReflectionUtils.java @@ -12,11 +12,13 @@ public class CachedReflectionUtils { private static final ClassValue<Map<String, Field>> declaredFields = new ConcurrentMapClassValue(); public static Field getField(final Class<?> cls, final String fieldName) { - return fields.get(cls).computeIfAbsent(fieldName, f -> FieldUtils.getField(cls, f, true)); + return fields.get(cls) + .computeIfAbsent(fieldName, f -> FieldUtils.getField(cls, f, true)); } public static Field getDeclaredField(final Class<?> cls, final String fieldName) { - return declaredFields.get(cls).computeIfAbsent(fieldName, f -> FieldUtils.getDeclaredField(cls, f, true)); + return declaredFields.get(cls) + .computeIfAbsent(fieldName, f -> FieldUtils.getDeclaredField(cls, f, true)); } private static class ConcurrentMapClassValue extends ClassValue<Map<String, Field>> { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksChecker.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksChecker.java index d35489a151..9feb344fa0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksChecker.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksChecker.java @@ -30,17 +30,23 @@ public class ConnectedBlocksChecker { World w = DimensionManager.getWorld(C.wID); int x = C.x, y = C.y, z = C.z; - if (w.getBlock(x + 1, y, z).equals(b)) ret = (byte) (ret | 0b000100); + if (w.getBlock(x + 1, y, z) + .equals(b)) ret = (byte) (ret | 0b000100); - if (w.getBlock(x - 1, y, z).equals(b)) ret = (byte) (ret | 0b001000); + if (w.getBlock(x - 1, y, z) + .equals(b)) ret = (byte) (ret | 0b001000); - if (w.getBlock(x, y, z + 1).equals(b)) ret = (byte) (ret | 0b010000); + if (w.getBlock(x, y, z + 1) + .equals(b)) ret = (byte) (ret | 0b010000); - if (w.getBlock(x, y, z - 1).equals(b)) ret = (byte) (ret | 0b100000); + if (w.getBlock(x, y, z - 1) + .equals(b)) ret = (byte) (ret | 0b100000); - if (w.getBlock(x, y + 1, z).equals(b)) ret = (byte) (ret | 0b000001); + if (w.getBlock(x, y + 1, z) + .equals(b)) ret = (byte) (ret | 0b000001); - if (w.getBlock(x, y - 1, z).equals(b)) ret = (byte) (ret | 0b000010); + if (w.getBlock(x, y - 1, z) + .equals(b)) ret = (byte) (ret | 0b000010); return ret; } @@ -94,17 +100,23 @@ public class ConnectedBlocksChecker { this.hashset.add(new Coords(x, y, z, wID)); - if (w.getBlock(x + 1, y, z).equals(b)) ret = (byte) (ret | 0b000100); + if (w.getBlock(x + 1, y, z) + .equals(b)) ret = (byte) (ret | 0b000100); - if (w.getBlock(x - 1, y, z).equals(b)) ret = (byte) (ret | 0b001000); + if (w.getBlock(x - 1, y, z) + .equals(b)) ret = (byte) (ret | 0b001000); - if (w.getBlock(x, y, z + 1).equals(b)) ret = (byte) (ret | 0b010000); + if (w.getBlock(x, y, z + 1) + .equals(b)) ret = (byte) (ret | 0b010000); - if (w.getBlock(x, y, z - 1).equals(b)) ret = (byte) (ret | 0b100000); + if (w.getBlock(x, y, z - 1) + .equals(b)) ret = (byte) (ret | 0b100000); - if (w.getBlock(x, y + 1, z).equals(b)) ret = (byte) (ret | 0b000001); + if (w.getBlock(x, y + 1, z) + .equals(b)) ret = (byte) (ret | 0b000001); - if (w.getBlock(x, y - 1, z).equals(b)) ret = (byte) (ret | 0b000010); + if (w.getBlock(x, y - 1, z) + .equals(b)) ret = (byte) (ret | 0b000010); return ret; } @@ -117,55 +129,55 @@ public class ConnectedBlocksChecker { for (Coords C : this.hashset) { if (GT) { if (!new Coords(C.x, C.y + 1, C.z, wID).equals(Controller) - && w.getTileEntity(C.x, C.y + 1, C.z) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x, C.y + 1, C.z) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } if (!new Coords(C.x, C.y - 1, C.z, wID).equals(Controller) - && w.getTileEntity(C.x, C.y - 1, C.z) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x, C.y - 1, C.z) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } if (!new Coords(C.x + 1, C.y, C.z, wID).equals(Controller) - && w.getTileEntity(C.x + 1, C.y, C.z) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x + 1, C.y, C.z) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } if (!new Coords(C.x - 1, C.y, C.z, wID).equals(Controller) - && w.getTileEntity(C.x - 1, C.y, C.z) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x - 1, C.y, C.z) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } if (!new Coords(C.x, C.y, C.z + 1, wID).equals(Controller) - && w.getTileEntity(C.x, C.y, C.z + 1) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x, C.y, C.z + 1) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } if (!new Coords(C.x, C.y, C.z - 1, wID).equals(Controller) - && w.getTileEntity(C.x, C.y, C.z - 1) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x, C.y, C.z - 1) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } } else { if (n == w.getBlockMetadata(C.x, C.y + 1, C.z) && !new Coords(C.x, C.y + 1, C.z, wID).equals(Controller) - || n == w.getBlockMetadata(C.x, C.y - 1, C.z) - && !new Coords(C.x, C.y - 1, C.z, wID).equals(Controller)) { + || n == w.getBlockMetadata(C.x, C.y - 1, C.z) + && !new Coords(C.x, C.y - 1, C.z, wID).equals(Controller)) { return true; } if (n == w.getBlockMetadata(C.x + 1, C.y, C.z) - && !new Coords(C.x + 1, C.y, C.z, wID).equals(Controller)) { + && !new Coords(C.x + 1, C.y, C.z, wID).equals(Controller)) { return true; } if (n == w.getBlockMetadata(C.x - 1, C.y, C.z) - && !new Coords(C.x - 1, C.y, C.z, wID).equals(Controller)) { + && !new Coords(C.x - 1, C.y, C.z, wID).equals(Controller)) { return true; } if (n == w.getBlockMetadata(C.x, C.y, C.z + 1) - && !new Coords(C.x, C.y, C.z + 1, wID).equals(Controller)) { + && !new Coords(C.x, C.y, C.z + 1, wID).equals(Controller)) { return true; } if (n == w.getBlockMetadata(C.x, C.y, C.z - 1) - && !new Coords(C.x, C.y, C.z - 1, wID).equals(Controller)) { + && !new Coords(C.x, C.y, C.z - 1, wID).equals(Controller)) { return true; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksCheckerIteration.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksCheckerIteration.java index 7dee6f3f98..cfd2c70d1d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksCheckerIteration.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksCheckerIteration.java @@ -41,32 +41,38 @@ public class ConnectedBlocksCheckerIteration { this.checked.add(tocheck); Coords c; if (!this.checked.contains(c = new Coords(tocheck.x + 1, tocheck.y, tocheck.z, wID)) - && w.getBlock(tocheck.x + 1, tocheck.y, tocheck.z).equals(b)) { + && w.getBlock(tocheck.x + 1, tocheck.y, tocheck.z) + .equals(b)) { this.kwoe.add(c); this.hashset.add(c); } if (!this.checked.contains(c = new Coords(tocheck.x - 1, tocheck.y, tocheck.z, wID)) - && w.getBlock(tocheck.x - 1, tocheck.y, tocheck.z).equals(b)) { + && w.getBlock(tocheck.x - 1, tocheck.y, tocheck.z) + .equals(b)) { this.kwoe.add(c); this.hashset.add(c); } if (!this.checked.contains(c = new Coords(tocheck.x, tocheck.y, tocheck.z + 1, wID)) - && w.getBlock(tocheck.x, tocheck.y, tocheck.z + 1).equals(b)) { + && w.getBlock(tocheck.x, tocheck.y, tocheck.z + 1) + .equals(b)) { this.kwoe.add(c); this.hashset.add(c); } if (!this.checked.contains(c = new Coords(tocheck.x, tocheck.y, tocheck.z - 1, wID)) - && w.getBlock(tocheck.x, tocheck.y, tocheck.z - 1).equals(b)) { + && w.getBlock(tocheck.x, tocheck.y, tocheck.z - 1) + .equals(b)) { this.kwoe.add(c); this.hashset.add(c); } if (!this.checked.contains(c = new Coords(tocheck.x, tocheck.y + 1, tocheck.z, wID)) - && w.getBlock(tocheck.x, tocheck.y + 1, tocheck.z).equals(b)) { + && w.getBlock(tocheck.x, tocheck.y + 1, tocheck.z) + .equals(b)) { this.kwoe.add(c); this.hashset.add(c); } if (!this.checked.contains(c = new Coords(tocheck.x, tocheck.y - 1, tocheck.z, wID)) - && w.getBlock(tocheck.x, tocheck.y - 1, tocheck.z).equals(b)) { + && w.getBlock(tocheck.x, tocheck.y - 1, tocheck.z) + .equals(b)) { this.kwoe.add(c); this.hashset.add(c); } @@ -82,55 +88,55 @@ public class ConnectedBlocksCheckerIteration { for (Coords C : this.hashset) { if (GT) { if (!new Coords(C.x, C.y + 1, C.z, wID).equals(Controller) - && w.getTileEntity(C.x, C.y + 1, C.z) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x, C.y + 1, C.z) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } if (!new Coords(C.x, C.y - 1, C.z, wID).equals(Controller) - && w.getTileEntity(C.x, C.y - 1, C.z) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x, C.y - 1, C.z) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } if (!new Coords(C.x + 1, C.y, C.z, wID).equals(Controller) - && w.getTileEntity(C.x + 1, C.y, C.z) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x + 1, C.y, C.z) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } if (!new Coords(C.x - 1, C.y, C.z, wID).equals(Controller) - && w.getTileEntity(C.x - 1, C.y, C.z) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x - 1, C.y, C.z) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } if (!new Coords(C.x, C.y, C.z + 1, wID).equals(Controller) - && w.getTileEntity(C.x, C.y, C.z + 1) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x, C.y, C.z + 1) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } if (!new Coords(C.x, C.y, C.z - 1, wID).equals(Controller) - && w.getTileEntity(C.x, C.y, C.z - 1) instanceof IGregTechTileEntity gtTE - && gtTE.getMetaTileID() == n) { + && w.getTileEntity(C.x, C.y, C.z - 1) instanceof IGregTechTileEntity gtTE + && gtTE.getMetaTileID() == n) { return true; } } else { if (n == w.getBlockMetadata(C.x, C.y + 1, C.z) && !new Coords(C.x, C.y + 1, C.z, wID).equals(Controller) - || n == w.getBlockMetadata(C.x, C.y - 1, C.z) - && !new Coords(C.x, C.y - 1, C.z, wID).equals(Controller)) { + || n == w.getBlockMetadata(C.x, C.y - 1, C.z) + && !new Coords(C.x, C.y - 1, C.z, wID).equals(Controller)) { return true; } if (n == w.getBlockMetadata(C.x + 1, C.y, C.z) - && !new Coords(C.x + 1, C.y, C.z, wID).equals(Controller)) { + && !new Coords(C.x + 1, C.y, C.z, wID).equals(Controller)) { return true; } if (n == w.getBlockMetadata(C.x - 1, C.y, C.z) - && !new Coords(C.x - 1, C.y, C.z, wID).equals(Controller)) { + && !new Coords(C.x - 1, C.y, C.z, wID).equals(Controller)) { return true; } if (n == w.getBlockMetadata(C.x, C.y, C.z + 1) - && !new Coords(C.x, C.y, C.z + 1, wID).equals(Controller)) { + && !new Coords(C.x, C.y, C.z + 1, wID).equals(Controller)) { return true; } if (n == w.getBlockMetadata(C.x, C.y, C.z - 1) - && !new Coords(C.x, C.y, C.z - 1, wID).equals(Controller)) { + && !new Coords(C.x, C.y, C.z - 1, wID).equals(Controller)) { return true; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/EnumUtils.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/EnumUtils.java index f96ffc8997..678f8facba 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/EnumUtils.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/EnumUtils.java @@ -23,30 +23,28 @@ public class EnumUtils { private EnumUtils() {} public static OrePrefixes addNewOrePrefix(String enumName, String aRegularLocalName, String aLocalizedMaterialPre, - String aLocalizedMaterialPost, boolean aIsUnificatable, boolean aIsMaterialBased, - boolean aIsSelfReferencing, boolean aIsContainer, boolean aDontUnificateActively, boolean aIsUsedForBlocks, - boolean aAllowNormalRecycling, boolean aGenerateDefaultItem, boolean aIsEnchantable, - boolean aIsUsedForOreProcessing, int aMaterialGenerationBits, long aMaterialAmount, int aDefaultStackSize, - int aTextureindex) { + String aLocalizedMaterialPost, boolean aIsUnificatable, boolean aIsMaterialBased, boolean aIsSelfReferencing, + boolean aIsContainer, boolean aDontUnificateActively, boolean aIsUsedForBlocks, boolean aAllowNormalRecycling, + boolean aGenerateDefaultItem, boolean aIsEnchantable, boolean aIsUsedForOreProcessing, + int aMaterialGenerationBits, long aMaterialAmount, int aDefaultStackSize, int aTextureindex) { return EnumHelper.addEnum( - OrePrefixes.class, - enumName, - new Class<?>[] { String.class, String.class, String.class, boolean.class, boolean.class, boolean.class, - boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, - boolean.class, int.class, long.class, int.class, int.class }, - new Object[] { aRegularLocalName, aLocalizedMaterialPre, aLocalizedMaterialPost, aIsUnificatable, - aIsMaterialBased, aIsSelfReferencing, aIsContainer, aDontUnificateActively, aIsUsedForBlocks, - aAllowNormalRecycling, aGenerateDefaultItem, aIsEnchantable, aIsUsedForOreProcessing, - aMaterialGenerationBits, aMaterialAmount, aDefaultStackSize, aTextureindex }); + OrePrefixes.class, + enumName, + new Class<?>[] { String.class, String.class, String.class, boolean.class, boolean.class, boolean.class, + boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, + int.class, long.class, int.class, int.class }, + new Object[] { aRegularLocalName, aLocalizedMaterialPre, aLocalizedMaterialPost, aIsUnificatable, + aIsMaterialBased, aIsSelfReferencing, aIsContainer, aDontUnificateActively, aIsUsedForBlocks, + aAllowNormalRecycling, aGenerateDefaultItem, aIsEnchantable, aIsUsedForOreProcessing, + aMaterialGenerationBits, aMaterialAmount, aDefaultStackSize, aTextureindex }); } public static Element createNewElement(String enumName, long aProtons, long aNeutrons, long aAdditionalMass, - long aHalfLifeSeconds, String aDecayTo, String aName, boolean aIsIsotope) { + long aHalfLifeSeconds, String aDecayTo, String aName, boolean aIsIsotope) { return EnumHelper.addEnum( - Element.class, - enumName, - new Class[] { long.class, long.class, long.class, long.class, String.class, String.class, - boolean.class }, - new Object[] { aProtons, aNeutrons, aAdditionalMass, aHalfLifeSeconds, aDecayTo, aName, aIsIsotope }); + Element.class, + enumName, + new Class[] { long.class, long.class, long.class, long.class, String.class, String.class, boolean.class }, + new Object[] { aProtons, aNeutrons, aAdditionalMass, aHalfLifeSeconds, aDecayTo, aName, aIsIsotope }); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/MurmurHash3.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/MurmurHash3.java index e230d43415..501b473d98 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/MurmurHash3.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/MurmurHash3.java @@ -36,13 +36,13 @@ public final class MurmurHash3 { */ public static long getLongLittleEndian(byte[] buf, int offset) { return (long) buf[offset + 7] << 56 // no mask needed - | (buf[offset + 6] & 0xffL) << 48 - | (buf[offset + 5] & 0xffL) << 40 - | (buf[offset + 4] & 0xffL) << 32 - | (buf[offset + 3] & 0xffL) << 24 - | (buf[offset + 2] & 0xffL) << 16 - | (buf[offset + 1] & 0xffL) << 8 - | buf[offset] & 0xffL; // no shift needed + | (buf[offset + 6] & 0xffL) << 48 + | (buf[offset + 5] & 0xffL) << 40 + | (buf[offset + 4] & 0xffL) << 32 + | (buf[offset + 3] & 0xffL) << 24 + | (buf[offset + 2] & 0xffL) << 16 + | (buf[offset + 1] & 0xffL) << 8 + | buf[offset] & 0xffL; // no shift needed } /** @@ -148,8 +148,8 @@ public final class MurmurHash3 { int utf32 = data.charAt(pos++); utf32 = (code - 0xD7C0 << 10) + (utf32 & 0x3FF); k2 = 0xff & (0xF0 | utf32 >> 18) | (0x80 | utf32 >> 12 & 0x3F) << 8 - | (0x80 | utf32 >> 6 & 0x3F) << 16 - | (0x80 | utf32 & 0x3F) << 24; + | (0x80 | utf32 >> 6 & 0x3F) << 16 + | (0x80 | utf32 & 0x3F) << 24; bits = 32; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/BartsNoise.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/BartsNoise.java index 951cf69f70..753940f655 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/BartsNoise.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/BartsNoise.java @@ -107,18 +107,18 @@ public class BartsNoise implements INoiseGen { double getNonOctavedNoise(double x, double y) { double phase = SimplexNoise - .noise(Math.pow(x * this.frequency, this.amplitude), Math.pow(y * this.frequency, this.amplitude)); + .noise(Math.pow(x * this.frequency, this.amplitude), Math.pow(y * this.frequency, this.amplitude)); return MathUtils.wrap(phase, 1); } public double getNeighbouringNoise(int x, int y) { return (this.getNoiseSingle(x - 1, y - 1) + this.getNoiseSingle(x, y - 1) - + this.getNoiseSingle(x - 1, y) - + this.getNoiseSingle(x + 1, y) - + this.getNoiseSingle(x, y + 1) - + this.getNoiseSingle(x + 1, y + 1) - + this.getNoiseSingle(x - 1, y + 1) - + this.getNoiseSingle(x + 1, y - 1)) / 8; + + this.getNoiseSingle(x - 1, y) + + this.getNoiseSingle(x + 1, y) + + this.getNoiseSingle(x, y + 1) + + this.getNoiseSingle(x + 1, y + 1) + + this.getNoiseSingle(x - 1, y + 1) + + this.getNoiseSingle(x + 1, y - 1)) / 8; } public double getNoiseSingle(int x, int y) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/SimplexNoise.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/SimplexNoise.java index 8e2e69c495..ca318e17b9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/SimplexNoise.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/NoiseUtil/SimplexNoise.java @@ -12,31 +12,30 @@ import com.github.bartimaeusnek.bartworks.util.MathUtils; public class SimplexNoise { // Simplex noise in 2D, 3D and 4D private static Grad[] grad3 = { new Grad(1, 1, 0), new Grad(-1, 1, 0), new Grad(1, -1, 0), new Grad(-1, -1, 0), - new Grad(1, 0, 1), new Grad(-1, 0, 1), new Grad(1, 0, -1), new Grad(-1, 0, -1), new Grad(0, 1, 1), - new Grad(0, -1, 1), new Grad(0, 1, -1), new Grad(0, -1, -1) }; + new Grad(1, 0, 1), new Grad(-1, 0, 1), new Grad(1, 0, -1), new Grad(-1, 0, -1), new Grad(0, 1, 1), + new Grad(0, -1, 1), new Grad(0, 1, -1), new Grad(0, -1, -1) }; private static Grad[] grad4 = { new Grad(0, 1, 1, 1), new Grad(0, 1, 1, -1), new Grad(0, 1, -1, 1), - new Grad(0, 1, -1, -1), new Grad(0, -1, 1, 1), new Grad(0, -1, 1, -1), new Grad(0, -1, -1, 1), - new Grad(0, -1, -1, -1), new Grad(1, 0, 1, 1), new Grad(1, 0, 1, -1), new Grad(1, 0, -1, 1), - new Grad(1, 0, -1, -1), new Grad(-1, 0, 1, 1), new Grad(-1, 0, 1, -1), new Grad(-1, 0, -1, 1), - new Grad(-1, 0, -1, -1), new Grad(1, 1, 0, 1), new Grad(1, 1, 0, -1), new Grad(1, -1, 0, 1), - new Grad(1, -1, 0, -1), new Grad(-1, 1, 0, 1), new Grad(-1, 1, 0, -1), new Grad(-1, -1, 0, 1), - new Grad(-1, -1, 0, -1), new Grad(1, 1, 1, 0), new Grad(1, 1, -1, 0), new Grad(1, -1, 1, 0), - new Grad(1, -1, -1, 0), new Grad(-1, 1, 1, 0), new Grad(-1, 1, -1, 0), new Grad(-1, -1, 1, 0), - new Grad(-1, -1, -1, 0) }; + new Grad(0, 1, -1, -1), new Grad(0, -1, 1, 1), new Grad(0, -1, 1, -1), new Grad(0, -1, -1, 1), + new Grad(0, -1, -1, -1), new Grad(1, 0, 1, 1), new Grad(1, 0, 1, -1), new Grad(1, 0, -1, 1), + new Grad(1, 0, -1, -1), new Grad(-1, 0, 1, 1), new Grad(-1, 0, 1, -1), new Grad(-1, 0, -1, 1), + new Grad(-1, 0, -1, -1), new Grad(1, 1, 0, 1), new Grad(1, 1, 0, -1), new Grad(1, -1, 0, 1), + new Grad(1, -1, 0, -1), new Grad(-1, 1, 0, 1), new Grad(-1, 1, 0, -1), new Grad(-1, -1, 0, 1), + new Grad(-1, -1, 0, -1), new Grad(1, 1, 1, 0), new Grad(1, 1, -1, 0), new Grad(1, -1, 1, 0), + new Grad(1, -1, -1, 0), new Grad(-1, 1, 1, 0), new Grad(-1, 1, -1, 0), new Grad(-1, -1, 1, 0), + new Grad(-1, -1, -1, 0) }; private static short[] p = { 151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103, - 30, 69, 142, 8, 99, 37, 240, 21, 10, 23, 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, - 117, 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, 171, 168, 68, 175, 74, 165, 71, 134, - 139, 48, 27, 166, 77, 146, 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, 245, - 40, 244, 102, 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, - 130, 116, 188, 159, 86, 164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, - 118, 126, 255, 82, 85, 212, 207, 206, 59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, - 248, 152, 2, 44, 154, 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39, 253, 19, 98, 108, 110, 79, - 113, 224, 232, 178, 185, 112, 104, 218, 246, 97, 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, - 241, 81, 51, 145, 235, 249, 14, 239, 107, 49, 192, 214, 31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, - 50, 45, 127, 4, 150, 254, 138, 236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, - 156, 180 }; + 30, 69, 142, 8, 99, 37, 240, 21, 10, 23, 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117, + 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, 171, 168, 68, 175, 74, 165, 71, 134, 139, 48, + 27, 166, 77, 146, 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244, 102, + 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, + 159, 86, 164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118, 126, 255, 82, + 85, 212, 207, 206, 59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, 248, 152, 2, 44, 154, + 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39, 253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, + 112, 104, 218, 246, 97, 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235, 249, + 14, 239, 107, 49, 192, 214, 31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138, + 236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, 156, 180 }; // To remove the need for index wrapping, double the permutation table length private static short[] perm = new short[512]; private static short[] permMod12 = new short[512]; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/NonNullWrappedHashMap.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/NonNullWrappedHashMap.java index a51ca06a9b..33173d19f2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/NonNullWrappedHashMap.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/NonNullWrappedHashMap.java @@ -49,7 +49,8 @@ public class NonNullWrappedHashMap<K, V> extends HashMap<K, V> { @Override public V getOrDefault(Object key, V defaultValue) { - return Objects - .requireNonNull(Optional.ofNullable(super.getOrDefault(key, defaultValue)).orElse(this.defaultValue)); + return Objects.requireNonNull( + Optional.ofNullable(super.getOrDefault(key, defaultValue)) + .orElse(this.defaultValue)); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/Pair.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/Pair.java index 5f7104f958..cd9bc1746e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/Pair.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/Pair.java @@ -45,10 +45,13 @@ public class Pair<A, B> implements Map.Entry<A, B> { @Override public int hashCode() { return MurmurHash3.murmurhash3_x86_32( - ByteBuffer.allocate(8).putInt(this.pair[0].hashCode()).putInt(this.pair[1].hashCode()).array(), - 0, - 8, - 31); + ByteBuffer.allocate(8) + .putInt(this.pair[0].hashCode()) + .putInt(this.pair[1].hashCode()) + .array(), + 0, + 8, + 31); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/RecipeFinderForParallel.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/RecipeFinderForParallel.java index dc6863b562..d0850b20c5 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/RecipeFinderForParallel.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/RecipeFinderForParallel.java @@ -29,7 +29,7 @@ public class RecipeFinderForParallel { * @return The parallel that it can reach */ public static int handleParallelRecipe(GT_Recipe aRecipe, FluidStack[] aFluidInputs, ItemStack[] aItemStacks, - int aMaxParallel) { + int aMaxParallel) { if (aFluidInputs == null) aFluidInputs = new FluidStack[0]; if (aItemStacks == null) aItemStacks = new ItemStack[0]; HashMap<Integer, Integer> tCompressedFluidInput = compressFluid(aFluidInputs); @@ -40,7 +40,7 @@ public class RecipeFinderForParallel { for (int tFluid : tCompressedFluidRecipe.keySet()) { if (tCompressedFluidInput.containsKey(tFluid) && tCompressedFluidRecipe.get(tFluid) != 0) { tCurrentPara = Math - .min(tCurrentPara, tCompressedFluidInput.get(tFluid) / tCompressedFluidRecipe.get(tFluid)); + .min(tCurrentPara, tCompressedFluidInput.get(tFluid) / tCompressedFluidRecipe.get(tFluid)); } } for (int tItem : tCompressedItemRecipe.keySet()) { @@ -83,7 +83,7 @@ public class RecipeFinderForParallel { tCompressedFluidRecipe.remove(tFluid.getFluidID()); } else { tCompressedFluidRecipe - .put(tFluid.getFluidID(), tCompressedFluidRecipe.get(tFluid.getFluidID()) - tFluid.amount); + .put(tFluid.getFluidID(), tCompressedFluidRecipe.get(tFluid.getFluidID()) - tFluid.amount); tFluid.amount = 0; } } @@ -91,7 +91,8 @@ public class RecipeFinderForParallel { /* OreDict Stuff */ /* Wildcard Stuff */ - for (Iterator<Integer> i = tCompressedItemRecipe.keySet().iterator(); i.hasNext();) { + for (Iterator<Integer> i = tCompressedItemRecipe.keySet() + .iterator(); i.hasNext();) { int tItem = i.next(); if (tItem >> 16 == Short.MAX_VALUE) { for (ItemStack tInputItem : aItemStacks) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/ResultWrongSievert.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/ResultWrongSievert.java index 7d3af3eb35..b6216f3c42 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/ResultWrongSievert.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/ResultWrongSievert.java @@ -34,11 +34,10 @@ public class ResultWrongSievert implements CheckRecipeResult { public String getDisplayString() { return switch (this.type) { case EXACTLY -> StatCollector.translateToLocalFormatted( - "GT5U.gui.text.wrong_sievert_exactly", - GT_Utility.formatNumbers(this.required)); - case MINIMUM -> StatCollector.translateToLocalFormatted( - "GT5U.gui.text.wrong_sievert_min", - GT_Utility.formatNumbers(this.required)); + "GT5U.gui.text.wrong_sievert_exactly", + GT_Utility.formatNumbers(this.required)); + case MINIMUM -> StatCollector + .translateToLocalFormatted("GT5U.gui.text.wrong_sievert_min", GT_Utility.formatNumbers(this.required)); }; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/StreamUtils.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/StreamUtils.java index c8fa354dac..4c1c82b9bf 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/StreamUtils.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/StreamUtils.java @@ -25,7 +25,9 @@ public class StreamUtils { public static Predicate<RecipeMap<?>> filterVisualMaps() { return recipeMap -> { - Optional<GT_Recipe> op = recipeMap.getAllRecipes().stream().findAny(); + Optional<GT_Recipe> op = recipeMap.getAllRecipes() + .stream() + .findAny(); return op.isPresent() && !op.get().mFakeRecipe; }; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityList.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityList.java index 6cbd1793ef..241f20c1f9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityList.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityList.java @@ -304,7 +304,8 @@ public class AccessPriorityList<E> implements List<E>, Deque<E>, Set<E> { node.setNext(null); node.setPriority(0L); node = node.getBefore(); - node.getNext().setBefore(null); + node.getNext() + .setBefore(null); } this.size = 0; this.head = null; @@ -321,7 +322,8 @@ public class AccessPriorityList<E> implements List<E>, Deque<E>, Set<E> { if (current == Long.MAX_VALUE || current > 0 && prio > 0 && prio + current < 0) node.setPriority(Long.MAX_VALUE); else node.setPriority(current + prio); - while (node.getBefore() != null && node.getPriority() >= node.getBefore().getPriority()) { + while (node.getBefore() != null && node.getPriority() >= node.getBefore() + .getPriority()) { this.moveNodeUp(node); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityListIterators.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityListIterators.java index bf3883e69f..f24105db17 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityListIterators.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/accessprioritylist/AccessPriorityListIterators.java @@ -29,7 +29,7 @@ public class AccessPriorityListIterators { boolean reverse; public AccessPriorityListListIterator(AccessPriorityListNode<E> head, AccessPriorityListNode<E> tail, - boolean reverse) { + boolean reverse) { this.head = head; this.tail = tail; this.current = reverse ? tail : head; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/log/DebugLog.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/log/DebugLog.java index c54138f1ae..6ead05ce96 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/util/log/DebugLog.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/log/DebugLog.java @@ -34,8 +34,12 @@ public class DebugLog { public static void initDebugLog(FMLPreInitializationEvent event) throws IOException { if (DebugLog.init) return; DebugLog.fh = new FileHandler( - new File(new File(event.getModConfigurationDirectory().getParentFile(), "logs"), "BWLog.log") - .toString()); + new File( + new File( + event.getModConfigurationDirectory() + .getParentFile(), + "logs"), + "BWLog.log").toString()); DebugLog.utilLog = Logger.getLogger("DebugLog"); DebugLog.utilLog.setUseParentHandlers(false); DebugLog.utilLog.addHandler(DebugLog.fh); @@ -47,7 +51,7 @@ public class DebugLog { Calendar cal = new GregorianCalendar(); cal.setTimeInMillis(record.getMillis()); return "Level: " + record - .getLevel() + " at " + logTime.format(cal.getTime()) + " " + record.getMessage() + "\n"; + .getLevel() + " at " + logTime.format(cal.getTime()) + " " + record.getMessage() + "\n"; } }; DebugLog.fh.setFormatter(formatter); diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java index 3aaea22017..b1264fb9af 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java @@ -37,19 +37,19 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; @Mod( - modid = BartWorksCrossmod.MOD_ID, - name = BartWorksCrossmod.NAME, - version = BartWorksCrossmod.VERSION, - dependencies = """ - required-after:IC2;\ - required-after:gregtech;\ - required-after:bartworks;\ - after:GalacticraftMars;\ - after:GalacticraftCore;\ - after:Micdoodlecore;\ - after:miscutils;\ - after:EMT;\ - after:tectech;""") + modid = BartWorksCrossmod.MOD_ID, + name = BartWorksCrossmod.NAME, + version = BartWorksCrossmod.VERSION, + dependencies = """ + required-after:IC2;\ + required-after:gregtech;\ + required-after:bartworks;\ + after:GalacticraftMars;\ + after:GalacticraftCore;\ + after:Micdoodlecore;\ + after:miscutils;\ + after:EMT;\ + after:tectech;""") public class BartWorksCrossmod { public static final String NAME = "BartWorks Mod Additions"; diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/GTpp/loader/RadioHatchCompat.java b/src/main/java/com/github/bartimaeusnek/crossmod/GTpp/loader/RadioHatchCompat.java index a5f4dfa079..b8fcdb9135 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/GTpp/loader/RadioHatchCompat.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/GTpp/loader/RadioHatchCompat.java @@ -109,9 +109,9 @@ public class RadioHatchCompat { DebugLog.log("Starting Generation of missing GT++ rods/longrods"); try { Class<? extends Item> rodclass = (Class<? extends Item>) Class - .forName("gtPlusPlus.core.item.base.rods.BaseItemRod"); + .forName("gtPlusPlus.core.item.base.rods.BaseItemRod"); Class<? extends Item> longrodclass = (Class<? extends Item>) Class - .forName("gtPlusPlus.core.item.base.rods.BaseItemRodLong"); + .forName("gtPlusPlus.core.item.base.rods.BaseItemRodLong"); Constructor<? extends Item> c1 = rodclass.getConstructor(RadioHatchCompat.materialClass); Constructor<? extends Item> c2 = longrodclass.getConstructor(RadioHatchCompat.materialClass); Field cOwners = GameData.class.getDeclaredField("customOwners"); @@ -121,56 +121,65 @@ public class RadioHatchCompat { Map<Item, String> UniqueIdentifierMap = (Map<Item, String>) map.get(GameData.getItemRegistry()); Map<GameRegistry.UniqueIdentifier, ModContainer> ownerItems = (Map<GameRegistry.UniqueIdentifier, ModContainer>) cOwners - .get(null); + .get(null); ModContainer gtpp = null; ModContainer bartworks = null; - for (ModContainer container : Loader.instance().getModList()) { + for (ModContainer container : Loader.instance() + .getModList()) { if (gtpp != null && bartworks != null) break; if (BartWorksCrossmod.MOD_ID.equalsIgnoreCase(container.getModId())) bartworks = container; - else if (container.getModId().equalsIgnoreCase(GTPlusPlus.ID)) gtpp = container; + else if (container.getModId() + .equalsIgnoreCase(GTPlusPlus.ID)) gtpp = container; } - for (Object mats : (Set<?>) RadioHatchCompat.materialClass.getField("mMaterialMap").get(null)) { + for (Object mats : (Set<?>) RadioHatchCompat.materialClass.getField("mMaterialMap") + .get(null)) { if (RadioHatchCompat.isRadioactive.getBoolean(mats)) { - if (OreDictionary.getOres("stick" + RadioHatchCompat.unlocalizedName.get(mats)).isEmpty()) { + if (OreDictionary.getOres("stick" + RadioHatchCompat.unlocalizedName.get(mats)) + .isEmpty()) { Item it = c1.newInstance(mats); UniqueIdentifierMap.replace(it, "miscutils:" + it.getUnlocalizedName()); GameRegistry.UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(it); ownerItems.replace(ui, bartworks, gtpp); String tanslate = it.getUnlocalizedName() + ".name=" - + RadioHatchCompat.localizedName.get(mats) - + " Rod"; + + RadioHatchCompat.localizedName.get(mats) + + " Rod"; RadioHatchCompat.TranslateSet.add(tanslate); DebugLog.log(tanslate); DebugLog.log("Generate: " + RadioHatchCompat.rod + RadioHatchCompat.unlocalizedName.get(mats)); } - if (OreDictionary.getOres("stickLong" + RadioHatchCompat.unlocalizedName.get(mats)).isEmpty()) { + if (OreDictionary.getOres("stickLong" + RadioHatchCompat.unlocalizedName.get(mats)) + .isEmpty()) { Item it2 = c2.newInstance(mats); UniqueIdentifierMap.replace(it2, "miscutils:" + it2.getUnlocalizedName()); GameRegistry.UniqueIdentifier ui2 = GameRegistry.findUniqueIdentifierFor(it2); ownerItems.replace(ui2, bartworks, gtpp); - DebugLog.log( - "Generate: " + RadioHatchCompat.longRod + RadioHatchCompat.unlocalizedName.get(mats)); + DebugLog + .log("Generate: " + RadioHatchCompat.longRod + RadioHatchCompat.unlocalizedName.get(mats)); } } } } catch (NoSuchFieldException | IllegalAccessException | NoSuchMethodException | InvocationTargetException - | InstantiationException | ClassNotFoundException e) { + | InstantiationException | ClassNotFoundException e) { e.printStackTrace(); } } public static IRadMaterial GTppRadChecker(ItemStack lStack) { try { - if (RadioHatchCompat.intf.isAssignableFrom(lStack.getItem().getClass())) { + if (RadioHatchCompat.intf.isAssignableFrom( + lStack.getItem() + .getClass())) { if (!RadioHatchCompat.isRadioactive.getBoolean(RadioHatchCompat.f.get(lStack.getItem()))) return null; - int amount = RadioHatchCompat.componentType.get(lStack.getItem()).equals(RadioHatchCompat.rod) ? 1 - : RadioHatchCompat.componentType.get(lStack.getItem()).equals(RadioHatchCompat.longRod) ? 2 : 0; + int amount = RadioHatchCompat.componentType.get(lStack.getItem()) + .equals(RadioHatchCompat.rod) ? 1 + : RadioHatchCompat.componentType.get(lStack.getItem()) + .equals(RadioHatchCompat.longRod) ? 2 : 0; if (amount == 0) return null; return new RadioHatchCompat.GTPPRadAdapter(amount, RadioHatchCompat.f.get(lStack.getItem())); } @@ -202,7 +211,8 @@ public class RadioHatchCompat { } private static boolean isElement(Object GTPPMaterial) throws IllegalAccessException { - return RadioHatchCompat.GTPPRadAdapter.getMaterialInput(GTPPMaterial).isEmpty(); + return RadioHatchCompat.GTPPRadAdapter.getMaterialInput(GTPPMaterial) + .isEmpty(); } private static List<?> getElemets(Object GTPPMaterial) throws IllegalAccessException { @@ -226,8 +236,8 @@ public class RadioHatchCompat { try { List<?> pureElements = RadioHatchCompat.GTPPRadAdapter.getElemets(m); for (Object materialObj : pureElements) if (RadioHatchCompat.isRadioactive.getBoolean(materialObj)) - ret += RadioHatchCompat.radlevel.getByte(m) + RadioHatchCompat.GTPPRadAdapter - .clampToZero(RadioHatchCompat.protons.getLong(materialObj)); + ret += RadioHatchCompat.radlevel.getByte(m) + + RadioHatchCompat.GTPPRadAdapter.clampToZero(RadioHatchCompat.protons.getLong(materialObj)); else ret += RadioHatchCompat.radlevel.getByte(m); } catch (IllegalAccessException e) { e.printStackTrace(); @@ -238,7 +248,7 @@ public class RadioHatchCompat { @Override public int getRadiationLevel(ItemStack aStack) { return RadioHatchCompat.GTPPRadAdapter.BUFFER - .computeIfAbsent(this.m, radlvl -> RadioHatchCompat.GTPPRadAdapter.calulateRad(this.m)); + .computeIfAbsent(this.m, radlvl -> RadioHatchCompat.GTPPRadAdapter.calulateRad(this.m)); } private static long clampToZero(long number) { diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/cls/CLSCompat.java b/src/main/java/com/github/bartimaeusnek/crossmod/cls/CLSCompat.java index 1b55aee240..adb3d42754 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/cls/CLSCompat.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/cls/CLSCompat.java @@ -40,21 +40,23 @@ public class CLSCompat { e.printStackTrace(); } - Optional.ofNullable(alexiilMinecraftDisplayer).ifPresent(e -> { - try { - isRegisteringBartWorks = e.getField("isRegisteringBartWorks"); - } catch (NoSuchFieldException ex) { - ex.printStackTrace(); - } - }); - - Optional.ofNullable(alexiilProgressDisplayer).ifPresent(e -> { - try { - displayProgress = e.getMethod("displayProgress", String.class, float.class); - } catch (NoSuchMethodException ex) { - ex.printStackTrace(); - } - }); + Optional.ofNullable(alexiilMinecraftDisplayer) + .ifPresent(e -> { + try { + isRegisteringBartWorks = e.getField("isRegisteringBartWorks"); + } catch (NoSuchFieldException ex) { + ex.printStackTrace(); + } + }); + + Optional.ofNullable(alexiilProgressDisplayer) + .ifPresent(e -> { + try { + displayProgress = e.getMethod("displayProgress", String.class, float.class); + } catch (NoSuchMethodException ex) { + ex.printStackTrace(); + } + }); } public static Integer[] initCls() { diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java index 6e2f133ddd..da9bd49397 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java @@ -112,7 +112,7 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri @Override protected boolean workingAtBottom(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, - int yHead, int oldYHead) { + int yHead, int oldYHead) { // if the dropMap has never been initialised or if the dropMap is empty if (this.dropMap == null || this.totalWeight == 0) this.calculateDropMap(); @@ -128,29 +128,36 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { - String casings = this.getCasingBlockItem().get(0).getDisplayName(); + String casings = this.getCasingBlockItem() + .get(0) + .getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Miner").addInfo("Controller Block for the Void Miner " + GT_Values.VN[this.getMinTier()]) - .addInfo("Consumes " + GT_Values.V[this.getMinTier()] + "EU/t") - .addInfo( - "Can be supplied with 2L/s of Neon(x4), Krypton(x8), Xenon(x16) or Oganesson(x64) for higher outputs.") - .addInfo( - "Will output " + 2 * this.TIER_MULTIPLIER - + " Ores per Second depending on the Dimension it is build in") - .addInfo("Put the Ore into the input bus to set the Whitelist/Blacklist") - .addInfo("Use a screwdriver to toggle Whitelist/Blacklist") - .addInfo("Blacklist or non Whitelist Ore will be VOIDED").addSeparator() - .beginStructureBlock(3, 7, 3, false).addController("Front bottom") - .addOtherStructurePart(casings, "form the 3x1x3 Base") - .addOtherStructurePart(casings, "1x3x1 pillar above the center of the base (2 minimum total)") - .addOtherStructurePart( - this.getFrameMaterial().mName + " Frame Boxes", - "Each pillar's side and 1x3x1 on top") - .addEnergyHatch(VN[this.getMinTier()] + "+, Any base casing").addMaintenanceHatch("Any base casing") - .addInputBus("Mining Pipes or Ores, optional, any base casing") - .addInputHatch("Optional noble gas, any base casing").addOutputBus("Any base casing") - .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); + tt.addMachineType("Miner") + .addInfo("Controller Block for the Void Miner " + GT_Values.VN[this.getMinTier()]) + .addInfo("Consumes " + GT_Values.V[this.getMinTier()] + "EU/t") + .addInfo( + "Can be supplied with 2L/s of Neon(x4), Krypton(x8), Xenon(x16) or Oganesson(x64) for higher outputs.") + .addInfo( + "Will output " + 2 * this.TIER_MULTIPLIER + + " Ores per Second depending on the Dimension it is build in") + .addInfo("Put the Ore into the input bus to set the Whitelist/Blacklist") + .addInfo("Use a screwdriver to toggle Whitelist/Blacklist") + .addInfo("Blacklist or non Whitelist Ore will be VOIDED") + .addSeparator() + .beginStructureBlock(3, 7, 3, false) + .addController("Front bottom") + .addOtherStructurePart(casings, "form the 3x1x3 Base") + .addOtherStructurePart(casings, "1x3x1 pillar above the center of the base (2 minimum total)") + .addOtherStructurePart( + this.getFrameMaterial().mName + " Frame Boxes", + "Each pillar's side and 1x3x1 on top") + .addEnergyHatch(VN[this.getMinTier()] + "+, Any base casing") + .addMaintenanceHatch("Any base casing") + .addInputBus("Mining Pipes or Ores, optional, any base casing") + .addInputHatch("Optional noble gas, any base casing") + .addOutputBus("Any base casing") + .toolTipFinisher(MULTIBLOCK_ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS); return tt; } @@ -168,13 +175,17 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri float currentWeight = 0.f; while (true) { float randomNumber = XSTR.XSTR_INSTANCE.nextFloat() * this.totalWeight; - for (Map.Entry<GT_Utility.ItemId, Float> entry : this.dropMap.getInternalMap().entrySet()) { + for (Map.Entry<GT_Utility.ItemId, Float> entry : this.dropMap.getInternalMap() + .entrySet()) { currentWeight += entry.getValue(); - if (randomNumber < currentWeight) return entry.getKey().getItemStack(); + if (randomNumber < currentWeight) return entry.getKey() + .getItemStack(); } - for (Map.Entry<GT_Utility.ItemId, Float> entry : this.extraDropMap.getInternalMap().entrySet()) { + for (Map.Entry<GT_Utility.ItemId, Float> entry : this.extraDropMap.getInternalMap() + .entrySet()) { currentWeight += entry.getValue(); - if (randomNumber < currentWeight) return entry.getKey().getItemStack(); + if (randomNumber < currentWeight) return entry.getKey() + .getItemStack(); } } } @@ -242,8 +253,10 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri if (VoidMinerUtility.dropMapsByDimId.containsKey(id)) { this.dropMap = VoidMinerUtility.dropMapsByDimId.get(id); } else { - String chunkProviderName = ((ChunkProviderServer) this.getBaseMetaTileEntity().getWorld() - .getChunkProvider()).currentChunkProvider.getClass().getName(); + String chunkProviderName = ((ChunkProviderServer) this.getBaseMetaTileEntity() + .getWorld() + .getChunkProvider()).currentChunkProvider.getClass() + .getName(); if (VoidMinerUtility.dropMapsByChunkProviderName.containsKey(chunkProviderName)) { this.dropMap = VoidMinerUtility.dropMapsByChunkProviderName.get(chunkProviderName); @@ -258,7 +271,8 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri private void calculateDropMap() { this.dropMap = new VoidMinerUtility.DropMap(); this.extraDropMap = new VoidMinerUtility.DropMap(); - int id = this.getBaseMetaTileEntity().getWorld().provider.dimensionId; + int id = this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId; this.handleModDimDef(id); this.handleExtraDrops(id); this.totalWeight = dropMap.getTotalWeight() + extraDropMap.getTotalWeight(); @@ -268,13 +282,16 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri * Output logic of the VM */ private void handleOutputs() { - final List<ItemStack> inputOres = this.getStoredInputs().stream().filter(GT_Utility::isOre) - .collect(Collectors.toList());; + final List<ItemStack> inputOres = this.getStoredInputs() + .stream() + .filter(GT_Utility::isOre) + .collect(Collectors.toList());; final ItemStack output = this.nextOre(); output.stackSize = multiplier; - if (inputOres.size() == 0 - || this.mBlacklist && inputOres.stream().noneMatch(is -> GT_Utility.areStacksEqual(is, output)) - || !this.mBlacklist && inputOres.stream().anyMatch(is -> GT_Utility.areStacksEqual(is, output))) + if (inputOres.size() == 0 || this.mBlacklist && inputOres.stream() + .noneMatch(is -> GT_Utility.areStacksEqual(is, output)) + || !this.mBlacklist && inputOres.stream() + .anyMatch(is -> GT_Utility.areStacksEqual(is, output))) this.addOutput(output); this.updateSlots(); } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/VoidMinerUtility.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/VoidMinerUtility.java index 7d4b205426..5254da24f1 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/VoidMinerUtility.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/VoidMinerUtility.java @@ -36,8 +36,8 @@ import gregtech.common.GT_Worldgen_GT_Ore_SmallPieces; public class VoidMinerUtility { public static final FluidStack[] NOBLE_GASSES = { WerkstoffLoader.Neon.getFluidOrGas(1), - WerkstoffLoader.Krypton.getFluidOrGas(1), WerkstoffLoader.Xenon.getFluidOrGas(1), - WerkstoffLoader.Oganesson.getFluidOrGas(1) }; + WerkstoffLoader.Krypton.getFluidOrGas(1), WerkstoffLoader.Xenon.getFluidOrGas(1), + WerkstoffLoader.Oganesson.getFluidOrGas(1) }; public static final int[] NOBEL_GASSES_MULTIPLIER = { 4, 8, 16, 64 }; public static class DropMap { @@ -71,7 +71,11 @@ public class VoidMinerUtility { */ public void addDrop(Block block, int meta, float weight) { if (ConfigHandler.voidMinerBlacklist.contains( - String.format("%s:%d", GameRegistry.findUniqueIdentifierFor(block).toString(), meta))) + String.format( + "%s:%d", + GameRegistry.findUniqueIdentifierFor(block) + .toString(), + meta))) return; Item item = Item.getItemFromBlock(block); addDrop(item, meta, weight); @@ -86,10 +90,11 @@ public class VoidMinerUtility { Item item = itemStack.getItem(); int meta = Items.feather.getDamage(itemStack); if (ConfigHandler.voidMinerBlacklist.contains( - String.format( - "%s:%d", - GameRegistry.findUniqueIdentifierFor(Block.getBlockFromItem(item)).toString(), - meta))) + String.format( + "%s:%d", + GameRegistry.findUniqueIdentifierFor(Block.getBlockFromItem(item)) + .toString(), + meta))) return; addDrop(item, meta, weight); } @@ -151,18 +156,19 @@ public class VoidMinerUtility { // Ore Veins Predicate<GT_Worldgen_GT_Ore_Layer> oreLayerPredicate = makeOreLayerPredicate(dimId); GT_Worldgen_GT_Ore_Layer.sList.stream() - .filter(gt_worldgen -> gt_worldgen.mEnabled && oreLayerPredicate.test(gt_worldgen)).forEach(element -> { - dropMap.addDrop(element.mPrimaryMeta, element.mWeight, false); - dropMap.addDrop(element.mSecondaryMeta, element.mWeight, false); - dropMap.addDrop(element.mSporadicMeta, element.mWeight / 8f, false); - dropMap.addDrop(element.mBetweenMeta, element.mWeight / 8f, false); - }); + .filter(gt_worldgen -> gt_worldgen.mEnabled && oreLayerPredicate.test(gt_worldgen)) + .forEach(element -> { + dropMap.addDrop(element.mPrimaryMeta, element.mWeight, false); + dropMap.addDrop(element.mSecondaryMeta, element.mWeight, false); + dropMap.addDrop(element.mSporadicMeta, element.mWeight / 8f, false); + dropMap.addDrop(element.mBetweenMeta, element.mWeight / 8f, false); + }); // Small Ores Predicate<GT_Worldgen_GT_Ore_SmallPieces> smallOresPredicate = makeSmallOresPredicate(dimId); GT_Worldgen_GT_Ore_SmallPieces.sList.stream() - .filter(gt_worldgen -> gt_worldgen.mEnabled && smallOresPredicate.test(gt_worldgen)) - .forEach(element -> dropMap.addDrop(element.mMeta, element.mAmount, false)); + .filter(gt_worldgen -> gt_worldgen.mEnabled && smallOresPredicate.test(gt_worldgen)) + .forEach(element -> dropMap.addDrop(element.mMeta, element.mAmount, false)); return dropMap; } @@ -233,51 +239,53 @@ public class VoidMinerUtility { // Normal Ore Veins GalacticGreg.oreVeinWorldgenList.stream() - .filter( - gt_worldgen -> gt_worldgen.mEnabled - && gt_worldgen instanceof GT_Worldgen_GT_Ore_Layer_Space oreLayerSpace - && oreLayerSpace.isEnabledForDim(finalDef)) - .map(gt_worldgen -> (GT_Worldgen_GT_Ore_Layer_Space) gt_worldgen).forEach(element -> { - dropMap.addDrop(element.mPrimaryMeta, element.mWeight, false); - dropMap.addDrop(element.mSecondaryMeta, element.mWeight, false); - dropMap.addDrop(element.mSporadicMeta, element.mWeight / 8f, false); - dropMap.addDrop(element.mBetweenMeta, element.mWeight / 8f, false); - }); + .filter( + gt_worldgen -> gt_worldgen.mEnabled + && gt_worldgen instanceof GT_Worldgen_GT_Ore_Layer_Space oreLayerSpace + && oreLayerSpace.isEnabledForDim(finalDef)) + .map(gt_worldgen -> (GT_Worldgen_GT_Ore_Layer_Space) gt_worldgen) + .forEach(element -> { + dropMap.addDrop(element.mPrimaryMeta, element.mWeight, false); + dropMap.addDrop(element.mSecondaryMeta, element.mWeight, false); + dropMap.addDrop(element.mSporadicMeta, element.mWeight / 8f, false); + dropMap.addDrop(element.mBetweenMeta, element.mWeight / 8f, false); + }); // Normal Small Ores GalacticGreg.smallOreWorldgenList.stream() - .filter( - gt_worldgen -> gt_worldgen.mEnabled - && gt_worldgen instanceof GT_Worldgen_GT_Ore_SmallPieces_Space oreSmallPiecesSpace - && oreSmallPiecesSpace.isEnabledForDim(finalDef)) - .map(gt_worldgen -> (GT_Worldgen_GT_Ore_SmallPieces_Space) gt_worldgen) - .forEach(element -> dropMap.addDrop(element.mMeta, element.mAmount, false)); + .filter( + gt_worldgen -> gt_worldgen.mEnabled + && gt_worldgen instanceof GT_Worldgen_GT_Ore_SmallPieces_Space oreSmallPiecesSpace + && oreSmallPiecesSpace.isEnabledForDim(finalDef)) + .map(gt_worldgen -> (GT_Worldgen_GT_Ore_SmallPieces_Space) gt_worldgen) + .forEach(element -> dropMap.addDrop(element.mMeta, element.mAmount, false)); // BW Ore Veins try { GalacticGreg.oreVeinWorldgenList.stream() - .filter( - gt_worldgen -> gt_worldgen.mEnabled - && gt_worldgen instanceof BW_Worldgen_Ore_Layer_Space oreLayerSpace - && oreLayerSpace.isEnabledForDim(finalDef)) - .map(gt_worldgen -> (BW_Worldgen_Ore_Layer_Space) gt_worldgen).forEach(oreLayer -> { - List<ItemStack> data = oreLayer.getStacks(); - dropMap.addDrop(data.get(0), oreLayer.mWeight); - dropMap.addDrop(data.get(1), oreLayer.mWeight); - dropMap.addDrop(data.get(2), oreLayer.mWeight / 8f); - dropMap.addDrop(data.get(3), oreLayer.mWeight / 8f); - }); + .filter( + gt_worldgen -> gt_worldgen.mEnabled + && gt_worldgen instanceof BW_Worldgen_Ore_Layer_Space oreLayerSpace + && oreLayerSpace.isEnabledForDim(finalDef)) + .map(gt_worldgen -> (BW_Worldgen_Ore_Layer_Space) gt_worldgen) + .forEach(oreLayer -> { + List<ItemStack> data = oreLayer.getStacks(); + dropMap.addDrop(data.get(0), oreLayer.mWeight); + dropMap.addDrop(data.get(1), oreLayer.mWeight); + dropMap.addDrop(data.get(2), oreLayer.mWeight / 8f); + dropMap.addDrop(data.get(3), oreLayer.mWeight / 8f); + }); } catch (NullPointerException ignored) {} // BW Small Ores try { GalacticGreg.smallOreWorldgenList.stream() - .filter( - gt_worldgen -> gt_worldgen.mEnabled - && gt_worldgen instanceof BW_Worldgen_Ore_SmallOre_Space smallOreSpace - && smallOreSpace.isEnabledForDim(finalDef)) - .map(gt_worldgen -> (BW_Worldgen_Ore_SmallOre_Space) gt_worldgen) - .forEach(element -> dropMap.addDrop(element.mPrimaryMeta, element.mDensity, element.bwOres != 0)); + .filter( + gt_worldgen -> gt_worldgen.mEnabled + && gt_worldgen instanceof BW_Worldgen_Ore_SmallOre_Space smallOreSpace + && smallOreSpace.isEnabledForDim(finalDef)) + .map(gt_worldgen -> (BW_Worldgen_Ore_SmallOre_Space) gt_worldgen) + .forEach(element -> dropMap.addDrop(element.mPrimaryMeta, element.mDensity, element.bwOres != 0)); } catch (NullPointerException ignored) {} return dropMap; } @@ -286,7 +294,8 @@ public class VoidMinerUtility { if (!extraDropsDimMap.containsKey(dimId)) { extraDropsDimMap.put(dimId, new DropMap()); } - extraDropsDimMap.get(dimId).addDrop(block, meta, weight); + extraDropsDimMap.get(dimId) + .addDrop(block, meta, weight); } /** diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java index 5d61796164..972254e2d9 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java @@ -61,7 +61,7 @@ public class GalacticraftProxy { private static void commonpreInit(FMLPreInitializationEvent e) { GalacticraftProxy.gtConf = new Configuration( - new File(new File(e.getModConfigurationDirectory(), "GregTech"), "GregTech.cfg")); + new File(new File(e.getModConfigurationDirectory(), "GregTech"), "GregTech.cfg")); GalacticraftProxy.uo_dimensionList.getConfig(GalacticraftProxy.gtConf, "undergroundfluid"); BW_WorldGenRoss128b.initundergroundFluids(); BW_WorldGenRoss128ba.init_undergroundFluids(); diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/atmosphere/BWAtmosphereManager.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/atmosphere/BWAtmosphereManager.java index 77877011cd..fa6d2db382 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/atmosphere/BWAtmosphereManager.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/atmosphere/BWAtmosphereManager.java @@ -51,7 +51,7 @@ public final class BWAtmosphereManager { public static final BWAtmosphereManager INSTANCE = new BWAtmosphereManager(); private static final ArrayListMultimap<Integer, Pair<ISubTagContainer, Integer>> gasConcentration = ArrayListMultimap - .create(); + .create(); public static List<Pair<ISubTagContainer, Integer>> getGasFromWorldID(int worldID) { return BWAtmosphereManager.gasConcentration.get(worldID); @@ -59,8 +59,10 @@ public final class BWAtmosphereManager { public static void removeGasFromWorld(int worldID, ISubTagContainer gas) { for (Pair<ISubTagContainer, Integer> pair : BWAtmosphereManager.gasConcentration.get(worldID)) { - if (pair.getKey().equals(gas)) { - BWAtmosphereManager.gasConcentration.get(worldID).remove(pair); + if (pair.getKey() + .equals(gas)) { + BWAtmosphereManager.gasConcentration.get(worldID) + .remove(pair); return; } } @@ -77,19 +79,21 @@ public final class BWAtmosphereManager { @SafeVarargs public static void addGasToWorld(int worldID, Pair<ISubTagContainer, Integer>... toPut) { - Arrays.stream(toPut).forEach(toadd -> BWAtmosphereManager.gasConcentration.put(worldID, toadd)); + Arrays.stream(toPut) + .forEach(toadd -> BWAtmosphereManager.gasConcentration.put(worldID, toadd)); } private static boolean addGCGasToWorld(int worldID, IAtmosphericGas gas, int aNumber, int aMaxNumber) { if (IAtmosphericGas.CO2.equals(gas)) { BWAtmosphereManager.addGasToWorld( - worldID, - Materials.CarbonDioxide, - BWAtmosphereManager.COEFFICIENT_MAP.get(aMaxNumber)[aNumber]); + worldID, + Materials.CarbonDioxide, + BWAtmosphereManager.COEFFICIENT_MAP.get(aMaxNumber)[aNumber]); return true; } String name = gas.toString(); - name = name.charAt(0) + name.substring(1).toLowerCase(Locale.US); + name = name.charAt(0) + name.substring(1) + .toLowerCase(Locale.US); ISubTagContainer mat = Materials.get(name); if (mat == Materials._NULL) { mat = WerkstoffLoader.getWerkstoff(name); @@ -103,14 +107,15 @@ public final class BWAtmosphereManager { @SubscribeEvent public void gcAutoRegister(GalaxyRegistry.PlanetRegisterEvent event) { - CelestialBody planet = GalaxyRegistry.getRegisteredPlanets().get(event.planetName); + CelestialBody planet = GalaxyRegistry.getRegisteredPlanets() + .get(event.planetName); for (int i = 0; i < planet.atmosphere.size(); i++) { if (!BWAtmosphereManager - .addGCGasToWorld(planet.getDimensionID(), planet.atmosphere.get(i), i, planet.atmosphere.size())) + .addGCGasToWorld(planet.getDimensionID(), planet.atmosphere.get(i), i, planet.atmosphere.size())) BartWorksCrossmod.LOGGER.warn( - "Unidentified Fluid (" + planet.atmosphere.get(i) - + ") in the Atmosphere of: " - + planet.getLocalizedName()); + "Unidentified Fluid (" + planet.atmosphere.get(i) + + ") in the Atmosphere of: " + + planet.getLocalizedName()); } } } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/AbstractWorldProviderSpace.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/AbstractWorldProviderSpace.java index 33f4f6f9ae..61c52865cf 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/AbstractWorldProviderSpace.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/AbstractWorldProviderSpace.java @@ -26,7 +26,8 @@ public abstract class AbstractWorldProviderSpace extends WorldProviderSpace impl @Override public String getDimensionName() { - return this.getCelestialBody().getLocalizedName(); + return this.getCelestialBody() + .getLocalizedName(); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java index c84ef4528b..b477154d39 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java @@ -61,7 +61,7 @@ public class ChunkProviderRoss128b extends ChunkProviderGenerate { @Override public List<SpawnListEntry> getPossibleCreatures(EnumCreatureType p_73155_1_, int p_73155_2_, int p_73155_3_, - int p_73155_4_) { + int p_73155_4_) { return null; } @@ -72,7 +72,7 @@ public class ChunkProviderRoss128b extends ChunkProviderGenerate { byte[] abyte = new byte[65536]; this.func_147424_a(p_73154_1_, p_73154_2_, ablock); this.biomesForGeneration = this.worldObj.getWorldChunkManager() - .loadBlockGeneratorData(this.biomesForGeneration, p_73154_1_ * 16, p_73154_2_ * 16, 16, 16); + .loadBlockGeneratorData(this.biomesForGeneration, p_73154_1_ * 16, p_73154_2_ * 16, 16, 16); for (int i = 0; i < this.biomesForGeneration.length; i++) { BiomeGenBase biomeGenBase = this.biomesForGeneration[i]; if (biomeGenBase.biomeID == BiomeGenBase.mushroomIsland.biomeID) { @@ -84,7 +84,7 @@ public class ChunkProviderRoss128b extends ChunkProviderGenerate { if (ThaumcraftHandler.isTaintBiome(biomeGenBase.biomeID)) this.biomesForGeneration[i] = BiomeGenBase.taiga; else if (ConfigHandler.disableMagicalForest - && ThaumcraftHandler.isMagicalForestBiome(biomeGenBase.biomeID)) + && ThaumcraftHandler.isMagicalForestBiome(biomeGenBase.biomeID)) this.biomesForGeneration[i] = BiomeGenBase.birchForest; } } @@ -117,13 +117,13 @@ public class ChunkProviderRoss128b extends ChunkProviderGenerate { } MinecraftForge.EVENT_BUS - .post(new PopulateChunkEvent.Pre(p_73153_1_, this.worldObj, this.rand, p_73153_2_, p_73153_3_, false)); + .post(new PopulateChunkEvent.Pre(p_73153_1_, this.worldObj, this.rand, p_73153_2_, p_73153_3_, false)); int x1; int y1; int z1; if (biomegenbase != BiomeGenBase.desert && biomegenbase != BiomeGenBase.desertHills - && TerrainGen.populate(p_73153_1_, this.worldObj, this.rand, p_73153_2_, p_73153_3_, false, LAKE)) { + && TerrainGen.populate(p_73153_1_, this.worldObj, this.rand, p_73153_2_, p_73153_3_, false, LAKE)) { x1 = k + this.rand.nextInt(16) + 8; y1 = this.rand.nextInt(256); z1 = l + this.rand.nextInt(16) + 8; @@ -132,10 +132,10 @@ public class ChunkProviderRoss128b extends ChunkProviderGenerate { else if (rni == 4) new WorldGenLakes(Blocks.water).generate(this.worldObj, this.rand, x1, y1, z1); } if (biomegenbase != BiomeGenBase.ocean && biomegenbase != BiomeGenBase.deepOcean - && biomegenbase != BiomeGenBase.river - && biomegenbase != BiomeGenBase.frozenOcean - && biomegenbase != BiomeGenBase.frozenRiver - && this.rand.nextInt(ConfigHandler.ross128bRuinChance) == 0) { + && biomegenbase != BiomeGenBase.river + && biomegenbase != BiomeGenBase.frozenOcean + && biomegenbase != BiomeGenBase.frozenRiver + && this.rand.nextInt(ConfigHandler.ross128bRuinChance) == 0) { x1 = k + this.rand.nextInt(16) + 3; y1 = this.rand.nextInt(256); z1 = l + this.rand.nextInt(16) + 3; @@ -164,7 +164,7 @@ public class ChunkProviderRoss128b extends ChunkProviderGenerate { BWOreGen.generate(this.rand, p_73153_2_, p_73153_3_, this.worldObj, this, this); MinecraftForge.EVENT_BUS - .post(new PopulateChunkEvent.Post(p_73153_1_, this.worldObj, this.rand, p_73153_2_, p_73153_3_, false)); + .post(new PopulateChunkEvent.Post(p_73153_1_, this.worldObj, this.rand, p_73153_2_, p_73153_3_, false)); BlockFalling.fallInstantly = false; } @@ -174,7 +174,7 @@ public class ChunkProviderRoss128b extends ChunkProviderGenerate { @Override public void replaceBlocksForBiome(int p_147422_1_, int p_147422_2_, Block[] blocks, byte[] metas, - BiomeGenBase[] p_147422_5_) { + BiomeGenBase[] p_147422_5_) { super.replaceBlocksForBiome(p_147422_1_, p_147422_2_, blocks, metas, p_147422_5_); for (int i = 0; i < blocks.length; i++) { if (blocks[i] == Blocks.grass) { diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/SkyProviderRoss128b.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/SkyProviderRoss128b.java index 26ad8d9d7a..d5368b3f0d 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/SkyProviderRoss128b.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/SkyProviderRoss128b.java @@ -21,5 +21,5 @@ public class SkyProviderRoss128b { // ASM enables this texture public static final ResourceLocation sunTex = new ResourceLocation( - BartWorksCrossmod.MOD_ID + ":galacticraft/Ross128b/World/SunRoss128.png"); + BartWorksCrossmod.MOD_ID + ":galacticraft/Ross128b/World/SunRoss128.png"); } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128ba/ChunkProviderRoss128ba.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128ba/ChunkProviderRoss128ba.java index 12668f59e1..18a8eadd2c 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128ba/ChunkProviderRoss128ba.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128ba/ChunkProviderRoss128ba.java @@ -56,7 +56,7 @@ public class ChunkProviderRoss128ba extends ChunkProviderMoon { Arrays.fill(ids, Blocks.air); this.generateTerrain(cx, cz, ids, meta); this.biomesForGeneration = this.worldObj.getWorldChunkManager() - .loadBlockGeneratorData(this.biomesForGeneration, cx * 16, cz * 16, 16, 16); + .loadBlockGeneratorData(this.biomesForGeneration, cx * 16, cz * 16, 16, 16); this.createCraters(cx, cz, ids, meta); this.replaceBlocksForBiome(cx, cz, ids, meta, this.biomesForGeneration); this.caveGenerator.generate(this, this.worldObj, cx, cz, ids, meta); diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/solarsystems/Ross128SolarSystem.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/solarsystems/Ross128SolarSystem.java index 171d149986..f7bdec79eb 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/solarsystems/Ross128SolarSystem.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/solarsystems/Ross128SolarSystem.java @@ -48,44 +48,44 @@ public class Ross128SolarSystem { public static void init() { Ross128SolarSystem.Ross128System = new SolarSystem("Ross128System", "milkyWay") - .setMapPosition(new Vector3(-0.5D, 0.65D, 0.0D)); + .setMapPosition(new Vector3(-0.5D, 0.65D, 0.0D)); Ross128SolarSystem.Ross128 = (Star) new Star("Ross128").setParentSolarSystem(Ross128SolarSystem.Ross128System) - .setTierRequired(-1); + .setTierRequired(-1); Ross128SolarSystem.Ross128.setUnreachable(); - Ross128SolarSystem.Ross128.setBodyIcon( - new ResourceLocation(BartWorksCrossmod.MOD_ID + ":galacticraft/Ross128b/MapObjs/Ross128.png")); + Ross128SolarSystem.Ross128 + .setBodyIcon(new ResourceLocation(BartWorksCrossmod.MOD_ID + ":galacticraft/Ross128b/MapObjs/Ross128.png")); Ross128SolarSystem.Ross128System.setMainStar(Ross128SolarSystem.Ross128); Ross128SolarSystem.Ross128b = new Planet("Ross128b").setParentSolarSystem(Ross128SolarSystem.Ross128System); Ross128SolarSystem.Ross128b.setRingColorRGB(0x9F / 255f, 0x8A / 255f, 0x79 / 255f); Ross128SolarSystem.Ross128b.setPhaseShift(1.25F); Ross128SolarSystem.Ross128b.setBodyIcon( - new ResourceLocation(BartWorksCrossmod.MOD_ID + ":galacticraft/Ross128b/MapObjs/Ross128b.png")); + new ResourceLocation(BartWorksCrossmod.MOD_ID + ":galacticraft/Ross128b/MapObjs/Ross128b.png")); Ross128SolarSystem.Ross128b.setRelativeDistanceFromCenter(new CelestialBody.ScalableDistance(0.75F, 1.75F)); Ross128SolarSystem.Ross128b.setRelativeOrbitTime(0.65F); Ross128SolarSystem.Ross128b.atmosphere - .addAll(Arrays.asList(IAtmosphericGas.OXYGEN, IAtmosphericGas.NITROGEN, IAtmosphericGas.ARGON)); + .addAll(Arrays.asList(IAtmosphericGas.OXYGEN, IAtmosphericGas.NITROGEN, IAtmosphericGas.ARGON)); Ross128SolarSystem.Ross128b.setDimensionInfo(ConfigHandler.ross128BID, WorldProviderRoss128b.class); Ross128SolarSystem.Ross128b.setTierRequired(ConfigHandler.ross128btier); Ross128SolarSystem.Ross128ba = new Moon("Ross128ba").setParentPlanet(Ross128SolarSystem.Ross128b); Ross128SolarSystem.Ross128ba.setRelativeDistanceFromCenter(new CelestialBody.ScalableDistance(10f, 15f)) - .setRelativeOrbitTime(1 / 0.01F); + .setRelativeOrbitTime(1 / 0.01F); Ross128SolarSystem.Ross128ba.setBodyIcon( - new ResourceLocation(BartWorksCrossmod.MOD_ID + ":galacticraft/Ross128b/MapObjs/Ross128ba.png")); + new ResourceLocation(BartWorksCrossmod.MOD_ID + ":galacticraft/Ross128b/MapObjs/Ross128ba.png")); Ross128SolarSystem.Ross128ba.setDimensionInfo(ConfigHandler.ross128BAID, WorldProviderRoss128ba.class); Ross128SolarSystem.Ross128ba - .setTierRequired(GalaxySpace.isModLoaded() ? Math.min(ConfigHandler.ross128btier + 2, 8) : 3); + .setTierRequired(GalaxySpace.isModLoaded() ? Math.min(ConfigHandler.ross128btier + 2, 8) : 3); GalaxyRegistry.registerSolarSystem(Ross128SolarSystem.Ross128System); GalaxyRegistry.registerPlanet(Ross128SolarSystem.Ross128b); GalaxyRegistry.registerMoon(Ross128SolarSystem.Ross128ba); GalacticraftRegistry.registerRocketGui( - WorldProviderRoss128b.class, - new ResourceLocation(GalacticraftCore.ASSET_PREFIX, "textures/gui/overworldRocketGui.png")); + WorldProviderRoss128b.class, + new ResourceLocation(GalacticraftCore.ASSET_PREFIX, "textures/gui/overworldRocketGui.png")); GalacticraftRegistry.registerRocketGui( - WorldProviderRoss128ba.class, - new ResourceLocation(GalacticraftCore.ASSET_PREFIX, "textures/gui/moonRocketGui.png")); + WorldProviderRoss128ba.class, + new ResourceLocation(GalacticraftCore.ASSET_PREFIX, "textures/gui/moonRocketGui.png")); GalacticraftRegistry.registerTeleportType(WorldProviderRoss128b.class, new UniversalTeleportType()); GalacticraftRegistry.registerTeleportType(WorldProviderRoss128ba.class, new UniversalTeleportType()); } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/GT_NBT_DataBase.java b/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/GT_NBT_DataBase.java index 0502f26f9c..cc9b1dcc2d 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/GT_NBT_DataBase.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/GT_NBT_DataBase.java @@ -42,7 +42,8 @@ public class GT_NBT_DataBase { } static GT_NBT_DataBase getGTTagFromId(Long id) { - return GT_NBT_DataBase.GTNBTBIMAP.inverse().get(id); + return GT_NBT_DataBase.GTNBTBIMAP.inverse() + .get(id); } static Long getIdFromGTTag(GT_NBT_DataBase tagCompound) { @@ -50,7 +51,8 @@ public class GT_NBT_DataBase { } static NBTTagCompound getTagFromId(Long id) { - return GT_NBT_DataBase.tagIdBiMap.inverse().get(id); + return GT_NBT_DataBase.tagIdBiMap.inverse() + .get(id); } static Long getIdFromTag(NBTTagCompound tagCompound) { @@ -89,7 +91,7 @@ public class GT_NBT_DataBase { } public static GT_NBT_DataBase makeNewWithoutRegister(String mDataName, String mDataTitle, - NBTTagCompound tagCompound) { + NBTTagCompound tagCompound) { return new GT_NBT_DataBase(tagCompound, mDataName, mDataTitle, Long.MIN_VALUE); } } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/TileEntity_GTDataServer.java b/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/TileEntity_GTDataServer.java index 469c23b065..fdfe3d7ee9 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/TileEntity_GTDataServer.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/openComputers/TileEntity_GTDataServer.java @@ -41,7 +41,7 @@ import li.cil.oc.api.network.SimpleComponent; @Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = Mods.Names.OPEN_COMPUTERS) public class TileEntity_GTDataServer extends TileEntity - implements ISidedInventory, ITileAddsInformation, ITileHasDifferentTextureSides, SimpleComponent { + implements ISidedInventory, ITileAddsInformation, ITileHasDifferentTextureSides, SimpleComponent { private final BiMap<Long, GT_NBT_DataBase> OrbDataBase = HashBiMap.create(); @@ -58,7 +58,12 @@ public class TileEntity_GTDataServer extends TileEntity public Object[] listData(Context context, Arguments args) { Set<String> ret = new HashSet<>(); for (Map.Entry<Long, GT_NBT_DataBase> entry : this.OrbDataBase.entrySet()) { - ret.add(entry.getValue().getId() + Long.MAX_VALUE + ". " + entry.getValue().getmDataTitle()); + ret.add( + entry.getValue() + .getId() + Long.MAX_VALUE + + ". " + + entry.getValue() + .getmDataTitle()); } return ret.toArray(new String[0]); } @@ -79,21 +84,21 @@ public class TileEntity_GTDataServer extends TileEntity if (this.isServerSide()) { if (GT_Utility.areStacksEqual(this.mItems[0], ItemList.Tool_DataOrb.get(1)) - && this.mItems[0].hasTagCompound()) { + && this.mItems[0].hasTagCompound()) { if (GT_NBT_DataBase.getIdFromTag(this.mItems[0].getTagCompound()) == null) { this.OrbDataBase.put( - GT_NBT_DataBase.getMaxID(), - new GT_NBT_DataBase( - Behaviour_DataOrb.getDataName(this.mItems[0]), - Behaviour_DataOrb.getDataTitle(this.mItems[0]), - this.mItems[0].getTagCompound())); + GT_NBT_DataBase.getMaxID(), + new GT_NBT_DataBase( + Behaviour_DataOrb.getDataName(this.mItems[0]), + Behaviour_DataOrb.getDataTitle(this.mItems[0]), + this.mItems[0].getTagCompound())); } else { long id = GT_NBT_DataBase.getIdFromTag(this.mItems[0].getTagCompound()); this.OrbDataBase.put(id, GT_NBT_DataBase.getGTTagFromId(id)); } } if (GT_Utility.areStacksEqual(this.mItems[0], ItemList.Tool_DataStick.get(1)) - && this.mItems[0].hasTagCompound()) { + && this.mItems[0].hasTagCompound()) { String bookTitle = GT_Utility.ItemNBT.getBookTitle(this.mItems[0]); String punchcardData = GT_Utility.ItemNBT.getPunchCardData(this.mItems[0]); @@ -101,13 +106,13 @@ public class TileEntity_GTDataServer extends TileEntity byte data = (byte) (bookTitle.isEmpty() ? punchcardData.isEmpty() ? mapID != -1 ? 3 : -1 : 2 : 1); String title = data == 1 ? bookTitle - : data == 2 ? punchcardData : data == 3 ? "" + mapID : "Custom Data"; + : data == 2 ? punchcardData : data == 3 ? "" + mapID : "Custom Data"; String name = data == 1 ? "eBook" - : data == 2 ? "Punch Card Data" : data == 3 ? "Map Data" : "Custom Data"; + : data == 2 ? "Punch Card Data" : data == 3 ? "Map Data" : "Custom Data"; if (GT_NBT_DataBase.getIdFromTag(this.mItems[0].getTagCompound()) == null) { this.OrbDataBase.put( - GT_NBT_DataBase.getMaxID(), - new GT_NBT_DataBase(name, title, this.mItems[0].getTagCompound())); + GT_NBT_DataBase.getMaxID(), + new GT_NBT_DataBase(name, title, this.mItems[0].getTagCompound())); } else { long id = GT_NBT_DataBase.getIdFromTag(this.mItems[0].getTagCompound()); this.OrbDataBase.put(id, GT_NBT_DataBase.getGTTagFromId(id)); diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java index 9166424a43..a760c5e256 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java @@ -34,61 +34,60 @@ public class TecTechResearchLoader { public static void runResearches() { Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null - ? FluidRegistry.getFluid("molten.indalloy140") - : FluidRegistry.getFluid("molten.solderingalloy"); + ? FluidRegistry.getFluid("molten.indalloy140") + : FluidRegistry.getFluid("molten.solderingalloy"); if (GalactiGreg.isModLoaded()) { TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemRegistry.voidminer[0].copy(), - 1024000, - 256, - (int) TierEU.RECIPE_ZPM, - 24, - new Object[] { ItemRegistry.voidminer[0].copy(), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 9L), - Materials.BlackPlutonium.getPlates(3), ItemList.Electric_Motor_ZPM.get(9L), - ItemList.Sensor_ZPM.get(9L), ItemList.Field_Generator_ZPM.get(9L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.BlackPlutonium, 36L) }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440), - WerkstoffLoader.Krypton.getFluidOrGas(20000) }, - ItemRegistry.voidminer[1].copy(), - 5 * MINUTES, - (int) TierEU.RECIPE_ZPM); + ItemRegistry.voidminer[0].copy(), + 1024000, + 256, + (int) TierEU.RECIPE_ZPM, + 24, + new Object[] { ItemRegistry.voidminer[0].copy(), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 9L), + Materials.BlackPlutonium.getPlates(3), ItemList.Electric_Motor_ZPM.get(9L), + ItemList.Sensor_ZPM.get(9L), ItemList.Field_Generator_ZPM.get(9L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.BlackPlutonium, 36L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Krypton.getFluidOrGas(20000) }, + ItemRegistry.voidminer[1].copy(), + 5 * MINUTES, + (int) TierEU.RECIPE_ZPM); TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemRegistry.voidminer[1].copy(), - 8192000, - 512, - (int) TierEU.RECIPE_UV, - 64, - new Object[] { ItemRegistry.voidminer[1].copy(), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 9L), - Materials.Neutronium.getPlates(3), ItemList.Electric_Motor_UV.get(9L), - ItemList.Sensor_UV.get(9L), ItemList.Field_Generator_UV.get(9L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 36L) }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440), - WerkstoffLoader.Oganesson.getFluidOrGas(20000) }, - ItemRegistry.voidminer[2].copy(), - 5 * MINUTES, - (int) TierEU.RECIPE_UV); - } - - TT_recipeAdder.addResearchableAssemblylineRecipe( - ItemList.Machine_Multi_ImplosionCompressor.get(1L), - 64000, - 48, + ItemRegistry.voidminer[1].copy(), + 8192000, + 512, (int) TierEU.RECIPE_UV, - 8, - new Object[] { ItemList.Machine_Multi_ImplosionCompressor.get(1L), Materials.Neutronium.getBlocks(5), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmium, 64), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Osmium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 64), - ItemList.Electric_Piston_UV.get(64), }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440), Materials.Osmium.getMolten(1440), - Materials.Neutronium.getMolten(1440) }, - ItemRegistry.eic.copy(), + 64, + new Object[] { ItemRegistry.voidminer[1].copy(), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 9L), + Materials.Neutronium.getPlates(3), ItemList.Electric_Motor_UV.get(9L), ItemList.Sensor_UV.get(9L), + ItemList.Field_Generator_UV.get(9L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 36L) }, + new FluidStack[] { new FluidStack(solderIndalloy, 1440), + WerkstoffLoader.Oganesson.getFluidOrGas(20000) }, + ItemRegistry.voidminer[2].copy(), 5 * MINUTES, (int) TierEU.RECIPE_UV); + } + + TT_recipeAdder.addResearchableAssemblylineRecipe( + ItemList.Machine_Multi_ImplosionCompressor.get(1L), + 64000, + 48, + (int) TierEU.RECIPE_UV, + 8, + new Object[] { ItemList.Machine_Multi_ImplosionCompressor.get(1L), Materials.Neutronium.getBlocks(5), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Osmium, 64), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Osmium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 64), + ItemList.Electric_Piston_UV.get(64), }, + new FluidStack[] { new FluidStack(solderIndalloy, 1440), Materials.Osmium.getMolten(1440), + Materials.Neutronium.getMolten(1440) }, + ItemRegistry.eic.copy(), + 5 * MINUTES, + (int) TierEU.RECIPE_UV); } } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/LowPowerLaser.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/LowPowerLaser.java index ae19e8d635..e3a2065ed5 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/LowPowerLaser.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/LowPowerLaser.java @@ -56,14 +56,15 @@ public interface LowPowerLaser extends IMetaTileEntity, IConnectsToEnergyTunnel } default void moveAroundLowPower(IGregTechTileEntity aBaseMetaTileEntity) { - byte color = this.getBaseMetaTileEntity().getColorization(); + byte color = this.getBaseMetaTileEntity() + .getColorization(); if (color >= 0) { ForgeDirection front = aBaseMetaTileEntity.getFrontFacing(); ForgeDirection opposite = front.getOpposite(); for (short dist = 1; dist < 250; ++dist) { IGregTechTileEntity tGTTileEntity = aBaseMetaTileEntity - .getIGregTechTileEntityAtSideAndDistance(front, dist); + .getIGregTechTileEntityAtSideAndDistance(front, dist); if (tGTTileEntity == null || tGTTileEntity.getColorization() != color) { return; } @@ -74,9 +75,9 @@ public interface LowPowerLaser extends IMetaTileEntity, IConnectsToEnergyTunnel } if (aMetaTileEntity instanceof LowPowerLaser lowPowerLaser && lowPowerLaser.isReceiver() - && opposite == tGTTileEntity.getFrontFacing()) { + && opposite == tGTTileEntity.getFrontFacing()) { if (this.maxEUOutput() > lowPowerLaser.maxEUInput() - || this.getAMPERES() > lowPowerLaser.getAMPERES()) { + || this.getAMPERES() > lowPowerLaser.getAMPERES()) { aMetaTileEntity.doExplosion(this.maxEUOutput()); this.setEUVar(aBaseMetaTileEntity.getStoredEU() - this.maxEUOutput()); return; @@ -84,19 +85,21 @@ public interface LowPowerLaser extends IMetaTileEntity, IConnectsToEnergyTunnel if (this.maxEUOutput() == lowPowerLaser.maxEUInput()) { long diff = Math.min( - this.getAMPERES() * 20L * this.maxEUOutput(), - Math.min( - lowPowerLaser.maxEUStore() - - aMetaTileEntity.getBaseMetaTileEntity().getStoredEU(), - aBaseMetaTileEntity.getStoredEU())); + this.getAMPERES() * 20L * this.maxEUOutput(), + Math.min( + lowPowerLaser.maxEUStore() - aMetaTileEntity.getBaseMetaTileEntity() + .getStoredEU(), + aBaseMetaTileEntity.getStoredEU())); this.setEUVar(aBaseMetaTileEntity.getStoredEU() - diff); - lowPowerLaser.setEUVar(aMetaTileEntity.getBaseMetaTileEntity().getStoredEU() + diff); + lowPowerLaser.setEUVar( + aMetaTileEntity.getBaseMetaTileEntity() + .getStoredEU() + diff); } return; } if ((!(aMetaTileEntity instanceof LowPowerLaser lowPowerLaser) || !lowPowerLaser.isTunnel()) - && !(aMetaTileEntity instanceof GT_MetaTileEntity_Pipe_Energy)) { + && !(aMetaTileEntity instanceof GT_MetaTileEntity_Pipe_Energy)) { return; } @@ -109,7 +112,7 @@ public interface LowPowerLaser extends IMetaTileEntity, IConnectsToEnergyTunnel } if (aMetaTileEntity instanceof LowPowerLaser lowPowerLaser && lowPowerLaser.isTunnel() - && !lowPowerLaser.isConnectedCorrectly(front)) { + && !lowPowerLaser.isConnectedCorrectly(front)) { return; } } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_Abstract_LowPowerLaserThingy.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_Abstract_LowPowerLaserThingy.java index ce6c44e1f7..c1d751739f 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_Abstract_LowPowerLaserThingy.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_Abstract_LowPowerLaserThingy.java @@ -26,30 +26,30 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; public abstract class TT_Abstract_LowPowerLaserThingy extends GT_MetaTileEntity_TieredMachineBlock - implements LowPowerLaser { + implements LowPowerLaser { protected long AMPERES; public TT_Abstract_LowPowerLaserThingy(int aID, String aName, String aNameRegional, int aTier, long aAmperes, - int aInvSlotCount, String aDescription, ITexture... aTextures) { + int aInvSlotCount, String aDescription, ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures); this.AMPERES = aAmperes; } public TT_Abstract_LowPowerLaserThingy(int aID, String aName, String aNameRegional, int aTier, long aAmperes, - int aInvSlotCount, String[] aDescription, ITexture... aTextures) { + int aInvSlotCount, String[] aDescription, ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures); this.AMPERES = aAmperes; } public TT_Abstract_LowPowerLaserThingy(String aName, int aTier, long aAmperes, int aInvSlotCount, - String aDescription, ITexture[][][] aTextures) { + String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); this.AMPERES = aAmperes; } public TT_Abstract_LowPowerLaserThingy(String aName, int aTier, long aAmperes, int aInvSlotCount, - String[] aDescription, ITexture[][][] aTextures) { + String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); this.AMPERES = aAmperes; } @@ -61,13 +61,13 @@ public abstract class TT_Abstract_LowPowerLaserThingy extends GT_MetaTileEntity_ @Override public boolean allowPullStack(IGregTechTileEntity iGregTechTileEntity, int i, ForgeDirection side, - ItemStack itemStack) { + ItemStack itemStack) { return false; } @Override public boolean allowPutStack(IGregTechTileEntity iGregTechTileEntity, int i, ForgeDirection side, - ItemStack itemStack) { + ItemStack itemStack) { return false; } @@ -93,7 +93,8 @@ public abstract class TT_Abstract_LowPowerLaserThingy extends GT_MetaTileEntity_ @Override public void saveNBTData(NBTTagCompound nbtTagCompound) { - Optional.ofNullable(nbtTagCompound).ifPresent(tag -> tag.setLong("AMPERES", this.AMPERES)); + Optional.ofNullable(nbtTagCompound) + .ifPresent(tag -> tag.setLong("AMPERES", this.AMPERES)); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java index d2e1c3aa52..b79ddb4a44 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserBox.java @@ -27,23 +27,25 @@ import gregtech.api.util.GT_Utility; public class TT_MetaTileEntity_LowPowerLaserBox extends TT_Abstract_LowPowerLaserThingy { public TT_MetaTileEntity_LowPowerLaserBox(int aID, String aName, String aNameRegional, int aTier, long aAmperes, - ITexture... aTextures) { + ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, aAmperes, 0, new String[0], aTextures); } public TT_MetaTileEntity_LowPowerLaserBox(String aName, int aTier, long aAmperes, String[] aDescription, - ITexture[][][] aTextures) { + ITexture[][][] aTextures) { super(aName, aTier, aAmperes, 0, aDescription, aTextures); } @Override public boolean isSender() { - return this.getBaseMetaTileEntity().isAllowedToWork(); + return this.getBaseMetaTileEntity() + .isAllowedToWork(); } @Override public boolean isReceiver() { - return !this.getBaseMetaTileEntity().isAllowedToWork(); + return !this.getBaseMetaTileEntity() + .isAllowedToWork(); } @Override @@ -53,12 +55,14 @@ public class TT_MetaTileEntity_LowPowerLaserBox extends TT_Abstract_LowPowerLase @Override public long maxAmperesOut() { - return !this.getBaseMetaTileEntity().isAllowedToWork() ? this.AMPERES : 0; + return !this.getBaseMetaTileEntity() + .isAllowedToWork() ? this.AMPERES : 0; } @Override public long maxAmperesIn() { - return this.getBaseMetaTileEntity().isAllowedToWork() ? this.AMPERES + this.AMPERES / 4 : 0; + return this.getBaseMetaTileEntity() + .isAllowedToWork() ? this.AMPERES + this.AMPERES / 4 : 0; } @Override @@ -73,27 +77,30 @@ public class TT_MetaTileEntity_LowPowerLaserBox extends TT_Abstract_LowPowerLase @Override public boolean isEnetInput() { - return this.getBaseMetaTileEntity().isAllowedToWork(); + return this.getBaseMetaTileEntity() + .isAllowedToWork(); } @Override public boolean isEnetOutput() { - return !this.getBaseMetaTileEntity().isAllowedToWork(); + return !this.getBaseMetaTileEntity() + .isAllowedToWork(); } @Override public boolean canConnect(ForgeDirection side) { - return side == this.getBaseMetaTileEntity().getFrontFacing(); + return side == this.getBaseMetaTileEntity() + .getFrontFacing(); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { return new TT_MetaTileEntity_LowPowerLaserBox( - this.mName, - this.mTier, - this.AMPERES, - this.mDescriptionArray, - this.mTextures); + this.mName, + this.mTier, + this.AMPERES, + this.mDescriptionArray, + this.mTextures); } @Override @@ -109,8 +116,8 @@ public class TT_MetaTileEntity_LowPowerLaserBox extends TT_Abstract_LowPowerLase this.setEUVar(0L); } } - if (this.getBaseMetaTileEntity().isAllowedToWork() - && aBaseMetaTileEntity.getStoredEU() > this.getMinimumStoredEU()) { + if (this.getBaseMetaTileEntity() + .isAllowedToWork() && aBaseMetaTileEntity.getStoredEU() > this.getMinimumStoredEU()) { this.moveAroundLowPower(aBaseMetaTileEntity); } } @@ -123,29 +130,29 @@ public class TT_MetaTileEntity_LowPowerLaserBox extends TT_Abstract_LowPowerLase for (byte i = -1; i < 16; ++i) { rTextures[0][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; rTextures[1][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; rTextures[2][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI[this.mTier] }; rTextures[3][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_LASER_TT[this.mTier] }; + com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_LASER_TT[this.mTier] }; rTextures[4][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_LASER_TT[this.mTier] }; + com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_LASER_TT[this.mTier] }; rTextures[5][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_LASER_TT[this.mTier] }; + com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_LASER_TT[this.mTier] }; rTextures[6][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; rTextures[7][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; rTextures[8][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; + Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier] }; rTextures[9][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_LASER_TT[this.mTier] }; + com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_LASER_TT[this.mTier] }; rTextures[10][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_LASER_TT[this.mTier] }; + com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_LASER_TT[this.mTier] }; rTextures[11][i + 1] = new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], - com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_LASER_TT[this.mTier] }; + com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_LASER_TT[this.mTier] }; } return rTextures; @@ -153,18 +160,18 @@ public class TT_MetaTileEntity_LowPowerLaserBox extends TT_Abstract_LowPowerLase @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int aColorIndex, boolean aActive, boolean aRedstone) { + int aColorIndex, boolean aActive, boolean aRedstone) { return this.mTextures[Math.min(2, side.ordinal()) + (side == facing ? 3 : 0) + (aActive ? 0 : 6)][aColorIndex - + 1]; + + 1]; } @Override public String[] getDescription() { return new String[] { "Like a Tranformer... but for LAZORZ", - "Transfer rate: " + ChatColorHelper.YELLOW - + GT_Utility.formatNumbers(this.getTotalPower()) - + ChatColorHelper.WHITE - + " EU/t", - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }; + "Transfer rate: " + ChatColorHelper.YELLOW + + GT_Utility.formatNumbers(this.getTotalPower()) + + ChatColorHelper.WHITE + + " EU/t", + BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }; } } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java index d2c9d888af..5a9cd8048b 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java @@ -27,25 +27,25 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_Utility; public class TT_MetaTileEntity_LowPowerLaserDynamo extends GT_MetaTileEntity_Hatch_DynamoTunnel - implements LowPowerLaser { + implements LowPowerLaser { public TT_MetaTileEntity_LowPowerLaserDynamo(int aID, String aName, String aNameRegional, int aTier, int aAmp) { super(aID, aName, aNameRegional, aTier, aAmp); } public TT_MetaTileEntity_LowPowerLaserDynamo(String aName, int aTier, int aAmp, String[] aDescription, - ITexture[][][] aTextures) { + ITexture[][][] aTextures) { super(aName, aTier, aAmp, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new TT_MetaTileEntity_LowPowerLaserDynamo( - this.mName, - this.mTier, - this.Amperes, - this.mDescriptionArray, - this.mTextures); + this.mName, + this.mTier, + this.Amperes, + this.mDescriptionArray, + this.mTextures); } @Override @@ -71,13 +71,13 @@ public class TT_MetaTileEntity_LowPowerLaserDynamo extends GT_MetaTileEntity_Hat @Override public String[] getDescription() { return ArrayUtils.addAll( - this.mDescriptionArray, - StatCollector.translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTotalPower()) - + EnumChatFormatting.RESET - + " EU/t", - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); + this.mDescriptionArray, + StatCollector.translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(this.getTotalPower()) + + EnumChatFormatting.RESET + + " EU/t", + BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java index 6a0425bfbc..6b6b6c3558 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java @@ -27,37 +27,37 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_Utility; public class TT_MetaTileEntity_LowPowerLaserHatch extends GT_MetaTileEntity_Hatch_EnergyTunnel - implements LowPowerLaser { + implements LowPowerLaser { public TT_MetaTileEntity_LowPowerLaserHatch(int aID, String aName, String aNameRegional, int aTier, int aAmp) { super(aID, aName, aNameRegional, aTier, aAmp); } public TT_MetaTileEntity_LowPowerLaserHatch(String aName, int aTier, int aAmp, String[] aDescription, - ITexture[][][] aTextures) { + ITexture[][][] aTextures) { super(aName, aTier, aAmp, aDescription, aTextures); } @Override public String[] getDescription() { return ArrayUtils.addAll( - this.mDescriptionArray, - StatCollector.translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getTotalPower()) - + EnumChatFormatting.RESET - + " EU/t", - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); + this.mDescriptionArray, + StatCollector.translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(this.getTotalPower()) + + EnumChatFormatting.RESET + + " EU/t", + BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get()); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new TT_MetaTileEntity_LowPowerLaserHatch( - this.mName, - this.mTier, - this.Amperes, - this.mDescriptionArray, - this.mTextures); + this.mName, + this.mTier, + this.Amperes, + this.mDescriptionArray, + this.mTextures); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_Pipe_Energy_LowPower.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_Pipe_Energy_LowPower.java index 63978c55df..38ad31688d 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_Pipe_Energy_LowPower.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_Pipe_Energy_LowPower.java @@ -41,21 +41,21 @@ public class TT_MetaTileEntity_Pipe_Energy_LowPower extends GT_MetaPipeEntity_Ca } public TT_MetaTileEntity_Pipe_Energy_LowPower(String aName, float aThickNess, Materials aMaterial, - long aCableLossPerMeter, long aAmperage, long aVoltage, boolean aInsulated, boolean aCanShock) { + long aCableLossPerMeter, long aAmperage, long aVoltage, boolean aInsulated, boolean aCanShock) { super(aName, aThickNess, aMaterial, aCableLossPerMeter, aAmperage, aVoltage, aInsulated, aCanShock); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { return new TT_MetaTileEntity_Pipe_Energy_LowPower( - this.mName, - this.mThickNess, - this.mMaterial, - this.mCableLossPerMeter, - this.mAmperage, - this.mVoltage, - this.mInsulated, - this.mCanShock); + this.mName, + this.mThickNess, + this.mMaterial, + this.mCableLossPerMeter, + this.mAmperage, + this.mVoltage, + this.mInsulated, + this.mCanShock); } @Override @@ -66,35 +66,35 @@ public class TT_MetaTileEntity_Pipe_Energy_LowPower extends GT_MetaPipeEntity_Ca } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection siide, byte aConnections, - int aColorIndex, boolean aConnected, boolean aRedstone) { + int aColorIndex, boolean aConnected, boolean aRedstone) { return new ITexture[] { TextureFactory.of( - Block.getBlockFromItem(Ic2Items.glassFiberCableBlock.getItem()), - Ic2Items.glassFiberCableBlock.getItemDamage(), - siide) }; + Block.getBlockFromItem(Ic2Items.glassFiberCableBlock.getItem()), + Ic2Items.glassFiberCableBlock.getItemDamage(), + siide) }; } @Override public String[] getDescription() { return new String[] { "Primitive Laser Cable intended for Low Power Applications", "Does not auto-connect", - "Does not turn or bend", - ChatColorHelper.WHITE + "Must be " - + ChatColorHelper.YELLOW - + "c" - + ChatColorHelper.RED - + "o" - + ChatColorHelper.BLUE - + "l" - + ChatColorHelper.DARKPURPLE - + "o" - + ChatColorHelper.GOLD - + "r" - + ChatColorHelper.DARKRED - + "e" - + ChatColorHelper.DARKGREEN - + "d" - + ChatColorHelper.WHITE - + " in order to work", - BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }; + "Does not turn or bend", + ChatColorHelper.WHITE + "Must be " + + ChatColorHelper.YELLOW + + "c" + + ChatColorHelper.RED + + "o" + + ChatColorHelper.BLUE + + "l" + + ChatColorHelper.DARKPURPLE + + "o" + + ChatColorHelper.GOLD + + "r" + + ChatColorHelper.DARKRED + + "e" + + ChatColorHelper.DARKGREEN + + "d" + + ChatColorHelper.WHITE + + " in order to work", + BW_Tooltip_Reference.ADDED_BY_BARTIMAEUSNEK_VIA_BARTWORKS.get() }; } @Override @@ -139,25 +139,25 @@ public class TT_MetaTileEntity_Pipe_Energy_LowPower extends GT_MetaPipeEntity_Ca @Override @Deprecated public long transferElectricity(ForgeDirection side, long aVoltage, long aAmperage, - ArrayList<TileEntity> aAlreadyPassedTileEntityList) { + ArrayList<TileEntity> aAlreadyPassedTileEntityList) { return 0L; } @Override public long transferElectricity(ForgeDirection side, long aVoltage, long aAmperage, - HashSet<TileEntity> aAlreadyPassedSet) { + HashSet<TileEntity> aAlreadyPassedSet) { return 0L; } @Override public boolean letsIn(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } @Override public boolean letsOut(GT_CoverBehavior coverBehavior, ForgeDirection side, int aCoverID, int aCoverVariable, - ICoverable aTileEntity) { + ICoverable aTileEntity) { return true; } } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java b/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java index 04e65781d6..2959bc2fb2 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java @@ -17,15 +17,15 @@ import vexatos.tgregworks.item.ItemTGregPart; import vexatos.tgregworks.reference.Config; @Mod( - modid = MaterialsInjector.MOD_ID, - name = MaterialsInjector.NAME, - version = MaterialsInjector.VERSION, - dependencies = """ - required-after:IC2;\ - required-after:gregtech;\ - required-after:bartworks;\ - before:TGregworks;\ - before:miscutils;""") + modid = MaterialsInjector.MOD_ID, + name = MaterialsInjector.NAME, + version = MaterialsInjector.VERSION, + dependencies = """ + required-after:IC2;\ + required-after:gregtech;\ + required-after:bartworks;\ + before:TGregworks;\ + before:miscutils;""") public class MaterialsInjector { public static final String NAME = "BartWorks Mod Additions - TGregworks Container"; @@ -42,12 +42,14 @@ public class MaterialsInjector { public static void run() { MainMod.LOGGER.info("Registering TGregworks - BartWorks tool parts."); Werkstoff.werkstoffHashSet.stream() - .filter(x -> x.hasItemType(OrePrefixes.gem) || x.hasItemType(OrePrefixes.plate)) - .map(Werkstoff::getBridgeMaterial).filter(x -> x.mMetaItemSubID == -1).filter(x -> x.mDurability != 0) - .forEach(m -> { - setConfigProps(m); - registerParts(m); - }); + .filter(x -> x.hasItemType(OrePrefixes.gem) || x.hasItemType(OrePrefixes.plate)) + .map(Werkstoff::getBridgeMaterial) + .filter(x -> x.mMetaItemSubID == -1) + .filter(x -> x.mDurability != 0) + .forEach(m -> { + setConfigProps(m); + registerParts(m); + }); TGregworks.registry.configProps.clear(); TGregworks.registry.configIDs.clear(); @@ -68,10 +70,11 @@ public class MaterialsInjector { } private static void setConfigProps(Materials m) { - if (TGregworks.config.get(Config.Category.Enable, m.mName, true).getBoolean(true)) { + if (TGregworks.config.get(Config.Category.Enable, m.mName, true) + .getBoolean(true)) { TGregworks.registry.toolMaterials.add(m); Property configProp = TGregworks.config - .get(Config.onMaterial(Config.MaterialID), m.mName, 0, null, 0, 100000); + .get(Config.onMaterial(Config.MaterialID), m.mName, 0, null, 0, 100000); TGregworks.registry.configProps.put(m, configProp); TGregworks.registry.configIDs.add(configProp.getInt()); } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/tile/GT_Multi_IndustrialCrucible.java b/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/tile/GT_Multi_IndustrialCrucible.java index 126684a302..c52e440383 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/tile/GT_Multi_IndustrialCrucible.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/tile/GT_Multi_IndustrialCrucible.java @@ -78,7 +78,7 @@ public class GT_Multi_IndustrialCrucible extends GT_MetaTileEntity_MultiBlockBas @Override public ITexture[] getTexture(IGregTechTileEntity iGregTechTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean b3, boolean b4) { + int colorIndex, boolean b3, boolean b4) { return new ITexture[0]; } } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/tile/GT_WandBuffer.java b/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/tile/GT_WandBuffer.java index 5dfada8a82..79e606d536 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/tile/GT_WandBuffer.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/tile/GT_WandBuffer.java @@ -73,8 +73,10 @@ public class GT_WandBuffer extends GT_MetaTileEntity_BasicBatteryBuffer { public long[] getStoredEnergy() { boolean scaleOverflow = false; boolean storedOverflow = false; - long tScale = this.getBaseMetaTileEntity().getEUCapacity(); - long tStored = this.getBaseMetaTileEntity().getStoredEU(); + long tScale = this.getBaseMetaTileEntity() + .getEUCapacity(); + long tStored = this.getBaseMetaTileEntity() + .getStoredEU(); long tStep; if (this.mInventory != null) { diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/util/ThaumcraftHandler.java b/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/util/ThaumcraftHandler.java index 7aca6b05b7..9492a6c077 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/util/ThaumcraftHandler.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/util/ThaumcraftHandler.java @@ -44,7 +44,9 @@ public class ThaumcraftHandler { public static boolean isWand(ItemStack aStack) { try { - return aStack != null && ThaumcraftHandler.mWandInterface.isAssignableFrom(aStack.getItem().getClass()); + return aStack != null && ThaumcraftHandler.mWandInterface.isAssignableFrom( + aStack.getItem() + .getClass()); } catch (Throwable var3) { return false; } @@ -54,8 +56,9 @@ public class ThaumcraftHandler { if (ThaumcraftHandler.magicalForestBiomeID == null) { try { BiomeGenBase biome = (BiomeGenBase) Class - .forName("thaumcraft.common.lib.world.ThaumcraftWorldGenerator").getField("biomeMagicalForest") - .get(null); + .forName("thaumcraft.common.lib.world.ThaumcraftWorldGenerator") + .getField("biomeMagicalForest") + .get(null); return biomeID == (ThaumcraftHandler.magicalForestBiomeID = biome.biomeID); } catch (ClassCastException | ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) { e.printStackTrace(); @@ -69,8 +72,9 @@ public class ThaumcraftHandler { if (ThaumcraftHandler.taintBiomeID == null) { try { BiomeGenBase TaintBiome = (BiomeGenBase) Class - .forName("thaumcraft.common.lib.world.ThaumcraftWorldGenerator").getField("biomeTaint") - .get(null); + .forName("thaumcraft.common.lib.world.ThaumcraftWorldGenerator") + .getField("biomeTaint") + .get(null); return biomeID == (ThaumcraftHandler.taintBiomeID = TaintBiome.biomeID); } catch (ClassCastException | ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) { e.printStackTrace(); @@ -100,28 +104,25 @@ public class ThaumcraftHandler { ThaumcraftHandler.AspectAdder.mAspectListClass = Class.forName("thaumcraft.api.aspects.AspectList"); ThaumcraftHandler.AspectAdder.mAspectClass = Class.forName("thaumcraft.api.aspects.Aspect"); ThaumcraftHandler.AspectAdder.addToList = ThaumcraftHandler.AspectAdder.mAspectListClass - .getMethod("add", ThaumcraftHandler.AspectAdder.mAspectClass, int.class); + .getMethod("add", ThaumcraftHandler.AspectAdder.mAspectClass, int.class); ThaumcraftHandler.AspectAdder.registerObjectTag = Class.forName("thaumcraft.api.ThaumcraftApi") - .getMethod( - "registerObjectTag", - ItemStack.class, - ThaumcraftHandler.AspectAdder.mAspectListClass); + .getMethod("registerObjectTag", ItemStack.class, ThaumcraftHandler.AspectAdder.mAspectListClass); ThaumcraftHandler.AspectAdder.getName = ThaumcraftHandler.AspectAdder.mAspectClass.getMethod("getName"); ThaumcraftHandler.AspectAdder.writeAspectListToNBT = ThaumcraftHandler.AspectAdder.mAspectListClass - .getMethod("writeToNBT", NBTTagCompound.class); + .getMethod("writeToNBT", NBTTagCompound.class); ThaumcraftHandler.AspectAdder.add = ThaumcraftHandler.AspectAdder.mAspectListClass - .getMethod("add", ThaumcraftHandler.AspectAdder.mAspectListClass); + .getMethod("add", ThaumcraftHandler.AspectAdder.mAspectListClass); ThaumcraftHandler.AspectAdder.getAmount = ThaumcraftHandler.AspectAdder.mAspectListClass - .getMethod("getAmount", ThaumcraftHandler.AspectAdder.mAspectClass); + .getMethod("getAmount", ThaumcraftHandler.AspectAdder.mAspectClass); ThaumcraftHandler.AspectAdder.getAspects = ThaumcraftHandler.AspectAdder.mAspectListClass - .getMethod("getAspects"); + .getMethod("getAspects"); ThaumcraftHandler.AspectAdder.readAspectListFromNBT = ThaumcraftHandler.AspectAdder.mAspectListClass - .getMethod("readFromNBT", NBTTagCompound.class); + .getMethod("readFromNBT", NBTTagCompound.class); ThaumcraftHandler.AspectAdder.isResearchComplete = Class - .forName("thaumcraft.common.lib.research.ResearchManager") - .getMethod("isResearchComplete", String.class, String.class); + .forName("thaumcraft.common.lib.research.ResearchManager") + .getMethod("isResearchComplete", String.class, String.class); ThaumcraftHandler.AspectAdder.linkedAspektList = ThaumcraftHandler.AspectAdder.mAspectListClass - .getField("aspects"); + .getField("aspects"); } catch (ClassNotFoundException | NoSuchMethodException | NoSuchFieldException e) { e.printStackTrace(); } @@ -131,16 +132,17 @@ public class ThaumcraftHandler { public static void addAspectViaBW(ItemStack stack, Pair<Object, Integer>... aspectPair) { if (stack == null || stack.getItem() == null || stack.getUnlocalizedName() == null) return; try { - Object aspectList = ThaumcraftHandler.AspectAdder.mAspectListClass.getConstructor().newInstance(); + Object aspectList = ThaumcraftHandler.AspectAdder.mAspectListClass.getConstructor() + .newInstance(); for (Pair<Object, Integer> a : aspectPair) { if (API_ConfigValues.debugLog) DebugLog.log( - "Stack:" + stack.getDisplayName() - + " Damage:" - + stack.getItemDamage() - + " aspectPair: " - + ThaumcraftHandler.AspectAdder.getName.invoke(a.getKey()) - + " / " - + a.getValue()); + "Stack:" + stack.getDisplayName() + + " Damage:" + + stack.getItemDamage() + + " aspectPair: " + + ThaumcraftHandler.AspectAdder.getName.invoke(a.getKey()) + + " / " + + a.getValue()); ThaumcraftHandler.AspectAdder.addToList.invoke(aspectList, a.getKey(), a.getValue()); } ThaumcraftHandler.AspectAdder.registerObjectTag.invoke(null, stack, aspectList); @@ -151,9 +153,10 @@ public class ThaumcraftHandler { public static void addAspectViaGT(ItemStack stack, TC_Aspects.TC_AspectStack... tc_aspectStacks) { try { - Object aspectList = ThaumcraftHandler.AspectAdder.mAspectListClass.getConstructor().newInstance(); + Object aspectList = ThaumcraftHandler.AspectAdder.mAspectListClass.getConstructor() + .newInstance(); for (TC_Aspects.TC_AspectStack tc_aspects : tc_aspectStacks) ThaumcraftHandler.AspectAdder.addToList - .invoke(aspectList, tc_aspects.mAspect.mAspect, (int) tc_aspects.mAmount); + .invoke(aspectList, tc_aspects.mAspect.mAspect, (int) tc_aspects.mAmount); ThaumcraftHandler.AspectAdder.registerObjectTag.invoke(null, stack, aspectList); } catch (Exception e) { e.printStackTrace(); |